diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 8e61ad3..36f3438 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.26.2-Buenos Aires" saveUser="tim" saveUserFull="Timothy Allen" projectname="Gun Run" saveDateTime="2022-08-28T15:21:13">
+<qgis saveUser="tim" saveDateTime="2022-08-30T11:53:16" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,248 +21,255 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Marshals" groupLayer="">
+    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_split_behavior="0" checked="Qt::Checked" name="marshal_positions">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" name="marshal_positions" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions" name="cached_name" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option type="QString" name="cached_name" value="marshal_positions"/>
+            <Option type="QString" name="legend/expressionFilter" value=""/>
+            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <Option type="int" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./extra_security.shp" legend_exp="" providerKey="ogr" id="extra_security20170921130834191" legend_split_behavior="0" checked="Qt::Unchecked" name="extra_security">
+      <layer-tree-layer id="extra_security20170921130834191" source="./extra_security.shp" legend_exp="" name="extra_security" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" providerKey="delimitedtext" id="marshals_by_position20161003112326575" legend_split_behavior="0" checked="Qt::Unchecked" name="marshals_by_position">
+      <layer-tree-layer id="marshals_by_position20161003112326575" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" name="marshals_by_position" expanded="1" patch_size="0,0" providerKey="delimitedtext" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="marshals_by_position"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_split_behavior="0" checked="Qt::Unchecked" name="complete_marshal_overview">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" name="complete_marshal_overview" expanded="1" patch_size="0,0" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_split_behavior="0" checked="Qt::Unchecked" name="marshal_overviews">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" name="marshal_overviews" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option type="QString" name="legend/expressionFilter" value=""/>
+            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="">
+    <layer-tree-group name="Fencing and Cones" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" name="fencing">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" name="cached_name" type="QString"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option type="QString" name="cached_name" value="fencing"/>
+            <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+            <Option type="QString" name="legend/expressionFilter" value=""/>
+            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" providerKey="virtual" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" legend_split_behavior="0" checked="Qt::Unchecked" name="fence_groups">
+      <layer-tree-layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" name="fence_groups" expanded="1" patch_size="0,0" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" checked="Qt::Checked" name="Markers" groupLayer="">
+      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer patch_size="-1,-1" expanded="1" 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=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(4,0)&amp;uid={a8c77adf-5243-4314-9a93-cf23b20dbc65}" legend_exp="" providerKey="memory" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" legend_split_behavior="0" checked="Qt::Checked" name="route_markers">
+        <layer-tree-layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" source="Point?crs=EPSG:4326&amp;uid={2bd4c115-aee9-42aa-af5c-425618621c58}" legend_exp="" name="route_markers" expanded="1" patch_size="-1,-1" providerKey="memory" checked="Qt::Checked" legend_split_behavior="0">
           <customproperties>
             <Option type="Map">
-              <Option value="1" name="showFeatureCount" type="int"/>
+              <Option type="int" name="showFeatureCount" value="1"/>
+            </Option>
+          </customproperties>
+        </layer-tree-layer>
+        <layer-tree-layer id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" source="Point?crs=EPSG:4326&amp;uid={40e6cb9e-7c5b-40c3-b431-03ac2c4bba96}" legend_exp="" name="route_markers" expanded="1" patch_size="-1,-1" providerKey="memory" checked="Qt::Unchecked" legend_split_behavior="0">
+          <customproperties>
+            <Option type="Map">
+              <Option type="int" name="showFeatureCount" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="0" name="showFeatureCount" type="int"/>
+            <Option type="QString" name="cached_name" value="all_routes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="int" name="showFeatureCount" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer patch_size="0,0" expanded="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' " legend_exp="" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_split_behavior="0" checked="Qt::Unchecked" name="timelapse">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " legend_exp="" name="timelapse" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
       <customproperties>
         <Option type="Map">
-          <Option value="timelapse" name="cached_name" type="QString"/>
+          <Option type="QString" name="cached_name" value="timelapse"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Feeding Stations" groupLayer="">
+    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./water_tables.shp" legend_exp="" providerKey="ogr" id="water_tables20170921142016467" legend_split_behavior="0" checked="Qt::Checked" name="water_tables">
+      <layer-tree-layer id="water_tables20170921142016467" source="./water_tables.shp" legend_exp="" name="water_tables" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="QString" name="cached_name" value="water_tables"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Ask Me" groupLayer="">
+    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" checked="Qt::Unchecked" name="poi_labels">
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" source="./poi_labels.shp|layername=poi_labels" legend_exp="" name="poi_labels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="poi_labels" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="poi_labels"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" checked="Qt::Unchecked" name="directions_to_start">
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" name="directions_to_start" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="directions_to_start" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="directions_to_start"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Residents Access" groupLayer="">
+    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./mayor.shp" legend_exp="" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_split_behavior="0" checked="Qt::Unchecked" name="mayor">
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" source="./mayor.shp" legend_exp="" name="mayor" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="mayor" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="mayor"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./viplabels.shp" legend_exp="" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_split_behavior="0" checked="Qt::Checked" name="viplabels">
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" source="./viplabels.shp" legend_exp="" name="viplabels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="viplabels" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="viplabels"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./vipaccess.shp" legend_exp="" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_split_behavior="0" checked="Qt::Checked" name="vipaccess">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" source="./vipaccess.shp" legend_exp="" name="vipaccess" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="vipaccess" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="vipaccess"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="0" source="./golfaccess.shp" legend_exp="" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_split_behavior="0" checked="Qt::Unchecked" name="golfaccess">
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" source="./golfaccess.shp" legend_exp="" name="golfaccess" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" checked="Qt::Unchecked" name="residents_access_roads">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" name="residents_access_roads" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="residents_access_roads" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="QString" name="cached_name" value="residents_access_roads"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./residents_access.shp|layername=residents_access" legend_exp="" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_split_behavior="0" checked="Qt::Unchecked" name="residents_access">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" source="./residents_access.shp|layername=residents_access" legend_exp="" name="residents_access" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="OSM data" groupLayer="">
+    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="0" source="./osm_roads.shp" legend_exp="" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_split_behavior="0" checked="Qt::Checked" name="osm_roads">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" source="./osm_roads.shp" legend_exp="" name="osm_roads" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option type="QString" name="cached_name" value="osm_roads [3887]"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./osm_places.shp|layername=osm_places" legend_exp="" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_split_behavior="0" checked="Qt::Checked" name="osm_places">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" source="./osm_places.shp|layername=osm_places" legend_exp="" name="osm_places" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option type="QString" name="cached_name" value="osm_places [7]"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Start and Finish pages" groupLayer="">
+    <layer-tree-group name="Start and Finish pages" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./data-comments.shp" legend_exp="" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_split_behavior="0" checked="Qt::Unchecked" name="data-comments">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" source="./data-comments.shp" legend_exp="" name="data-comments" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./start_finish_area.shp" legend_exp="" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_split_behavior="0" checked="Qt::Unchecked" name="start_finish_area">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" source="./start_finish_area.shp" legend_exp="" name="start_finish_area" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Elevation" groupLayer="">
+    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./capetownelevation-1m.shp" legend_exp="" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_split_behavior="0" checked="Qt::Unchecked" name="capetownelevation-1m">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" source="./capetownelevation-1m.shp" legend_exp="" name="capetownelevation-1m" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Map" groupLayer="">
+    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_split_behavior="0" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" patch_size="0,0" providerKey="gdal" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="QString" name="cached_name" value="GDAL-City of Cape Town 2015 Aerial"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" 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" legend_exp="" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_split_behavior="0" checked="Qt::Checked" name="Outlines">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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" legend_exp="" name="Outlines" expanded="1" patch_size="0,0" providerKey="wms" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="QString" name="cached_name" value="Outlines"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -292,34 +299,36 @@
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
-      <item>route_markers_6943d827_bf32_40af_988d_60a736c1d3e1</item>
+      <item>route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7</item>
+      <item>route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings self-snapping="1" tolerance="10" maxScale="0" intersection-snapping="1" enabled="0" mode="3" type="1" scaleDependencyMode="0" minScale="0" unit="1">
+  <snapping-settings tolerance="10" mode="3" type="1" scaleDependencyMode="0" unit="1" minScale="0" intersection-snapping="1" maxScale="0" enabled="0" self-snapping="1">
     <individual-layer-settings>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0" type="1" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0" type="1" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0" type="1" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0" type="1" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" enabled="0" type="0" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="0" maxScale="0" units="2" id="extra_security20170921130834191" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="20" maxScale="0" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" type="2" minScale="0"/>
-      <layer-setting tolerance="0" maxScale="0" units="2" id="water_tables20170921142016467" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="extra_security20170921130834191" tolerance="0" type="2" units="2" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" units="1" minScale="0" maxScale="0" enabled="1"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" tolerance="12" type="0" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" tolerance="12" type="0" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="water_tables20170921142016467" tolerance="0" type="2" units="2" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -327,10 +336,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.39819585919646983</xmin>
-      <ymin>-33.90642284955147545</ymin>
-      <xmax>18.39933053886358749</xmax>
-      <ymax>-33.90508771997006932</ymax>
+      <xmin>18.35711011631522638</xmin>
+      <ymin>-33.95802701381087729</ymin>
+      <xmax>18.43083771939430449</xmax>
+      <ymax>-33.87127486098422935</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -351,161 +360,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" checked="Qt::Checked" name="Marshals">
-      <legendlayer open="true" showFeatureCount="1" drawingOrder="-1" checked="Qt::Checked" name="marshal_positions">
+    <legendgroup name="Marshals" open="true" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" name="marshal_positions" open="true" showFeatureCount="1" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="extra_security">
+      <legendlayer drawingOrder="-1" name="extra_security" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="extra_security20170921130834191" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="marshals_by_position">
+      <legendlayer drawingOrder="-1" name="marshals_by_position" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="marshals_by_position20161003112326575" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="complete_marshal_overview">
+      <legendlayer drawingOrder="-1" name="complete_marshal_overview" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="marshal_overviews">
+      <legendlayer drawingOrder="-1" name="marshal_overviews" open="false" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Fencing and Cones">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="fencing">
+    <legendgroup name="Fencing and Cones" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="fencing" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="fence_groups">
+      <legendlayer drawingOrder="-1" name="fence_groups" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Routes">
-      <legendgroup open="true" checked="Qt::Checked" name="Markers">
-        <legendlayer open="true" showFeatureCount="1" drawingOrder="-1" checked="Qt::Checked" name="route_markers">
+    <legendgroup name="Routes" open="true" checked="Qt::Checked">
+      <legendgroup name="Markers" open="true" checked="Qt::Checked">
+        <legendlayer drawingOrder="-1" name="route_markers" open="true" showFeatureCount="1" checked="Qt::Checked">
           <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" layerid="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" isInOverview="0"/>
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+          </filegroup>
+        </legendlayer>
+        <legendlayer drawingOrder="-1" name="route_markers" open="true" showFeatureCount="1" checked="Qt::Unchecked">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="all_routes">
+      <legendlayer drawingOrder="-1" name="all_routes" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="timelapse">
+    <legendlayer drawingOrder="-1" name="timelapse" open="false" showFeatureCount="0" checked="Qt::Unchecked">
       <filegroup open="false" hidden="false">
-        <legendlayerfile visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0"/>
+        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Feeding Stations">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="water_tables">
+    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="water_tables" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="water_tables20170921142016467" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="poi_labels">
+    <legendgroup name="Ask Me" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="poi_labels" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="directions_to_start">
+      <legendlayer drawingOrder="-1" name="directions_to_start" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="mayor">
+    <legendgroup name="Residents Access" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="mayor" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="viplabels">
+      <legendlayer drawingOrder="-1" name="viplabels" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="vipaccess">
+      <legendlayer drawingOrder="-1" name="vipaccess" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="golfaccess">
+      <legendlayer drawingOrder="-1" name="golfaccess" open="false" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="residents_access_roads">
+      <legendlayer drawingOrder="-1" name="residents_access_roads" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="residents_access">
+      <legendlayer drawingOrder="-1" name="residents_access" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
-      <legendlayer open="false" showFeatureCount="1" drawingOrder="-1" checked="Qt::Checked" name="osm_roads">
+    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" name="osm_roads" open="false" showFeatureCount="1" checked="Qt::Checked">
         <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="1" drawingOrder="-1" checked="Qt::Checked" name="osm_places">
+      <legendlayer drawingOrder="-1" name="osm_places" open="true" showFeatureCount="1" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Start and Finish pages">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="data-comments">
+    <legendgroup name="Start and Finish pages" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="data-comments" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="start_finish_area">
+      <legendlayer drawingOrder="-1" name="start_finish_area" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
-      <legendlayer open="true" showFeatureCount="1" drawingOrder="-1" checked="Qt::Unchecked" name="capetownelevation-1m">
+    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="capetownelevation-1m" open="true" showFeatureCount="1" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer open="false" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial">
+    <legendgroup name="Map" open="true" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" open="false" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="Outlines">
+      <legendlayer drawingOrder="-1" name="Outlines" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="annotation" refreshOnNotifyEnabled="0">
+  <main-annotation-layer type="annotation" autoRefreshTime="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" autoRefreshEnabled="0" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -556,7 +570,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer maxScale="100000" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" minScale="1e+08">
+    <maplayer type="raster" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" minScale="1e+08" autoRefreshEnabled="0" maxScale="100000" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -621,7 +635,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -646,58 +660,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" enabled="0" symbology="Line" zscale="1">
+      <elevation band="1" zoffset="0" enabled="0" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="152,125,183,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="152,125,183,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -728,36 +742,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="152,125,183,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -772,9 +786,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -783,27 +797,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="false" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Value" name="identify/format" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="WMSBackgroundLayer" value="false"/>
+          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="QString" name="identify/format" value="Value"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
           <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer greenBand="2" blueBand="3" type="multibandcolor" nodataColor="" opacity="0.5" redBand="1" alphaBand="-1">
+        <rasterrenderer opacity="0.5" alphaBand="-1" type="multibandcolor" nodataColor="" blueBand="3" greenBand="2" redBand="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -814,14 +828,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255"/>
+        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
+        <huesaturation colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeBlue="128" colorizeRed="255" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" minScale="1e+08">
+    <maplayer type="raster" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" minScale="1e+08" autoRefreshEnabled="0" maxScale="0" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -886,7 +900,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -909,58 +923,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" enabled="0" symbology="Line" zscale="1">
+      <elevation band="1" zoffset="0" enabled="0" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="225,89,137,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="225,89,137,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -991,36 +1005,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1035,9 +1049,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1046,27 +1060,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="true" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Undefined" name="identify/format" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="WMSBackgroundLayer" value="true"/>
+          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="QString" name="identify/format" value="Undefined"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
           <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer band="1" type="singlebandcolordata" nodataColor="" opacity="0.75" alphaBand="-1">
+        <rasterrenderer opacity="0.75" alphaBand="-1" type="singlebandcolordata" nodataColor="" band="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1077,25 +1091,25 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255"/>
+        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
+        <huesaturation colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeBlue="128" colorizeRed="255" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
-        <ymax>-33.89943083574347327</ymax>
+        <ymax>-33.89943829535213382</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
-        <ymax>-33.89943083574347327</ymax>
+        <ymax>-33.89943829535213382</ymax>
       </wgs84extent>
       <id>all_routes_5833accf_77da_42ef_a24a_197208cd2190</id>
       <datasource>./all_routes.shp|layername=all_routes</datasource>
@@ -1149,7 +1163,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1163,8 +1177,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="integer" precision="0" length="6" comment="" expression="$length" subType="0" name="length_m" type="2"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="$length / 1000" subType="0" name="length_km" type="6"/>
+        <field length="-1" expression="$length * 100" precision="0" comment="" type="6" name="length_km" subType="0" typeName="double precision"/>
+        <field length="-1" expression="$length * 100 * 1000" precision="0" comment="" type="6" name="length_m" subType="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1177,58 +1191,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="RouteLen" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="RouteLen" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="229,182,54,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="229,182,54,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1259,36 +1273,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,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="164,130,39,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="164,130,39,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1303,44 +1317,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,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="164,130,39,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="164,130,39,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1363,53 +1377,59 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" checkstate="0" label="Active Routes">
-            <rule symbol="1" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" checkstate="0" label="21KM"/>
-            <rule symbol="2" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" checkstate="0" label="10KM"/>
-            <rule symbol="3" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" checkstate="0" label="5KM"/>
-            <rule symbol="4" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" checkstate="0" label="Trail"/>
+          <rule symbol="0" label="Active Routes" checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
+            <rule symbol="1" label="21KM" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
+            <rule symbol="2" label="10KM" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
+            <rule symbol="3" label="5KM" checkstate="0" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
+            <rule symbol="4" label="Trail" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
           </rule>
-          <rule symbol="5" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0" label="Always show"/>
-          <rule symbol="6" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show by day"/>
+          <rule symbol="5" label="Show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule symbol="6" label="21KM" 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 symbol="7" label="10KM" 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 symbol="8" label="5KM" checkstate="0" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule symbol="9" label="Trail" 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="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule symbol="11" label="Always show by day" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1429,44 +1449,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1482,32 +1502,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@0@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@0@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1522,15 +1542,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1538,35 +1558,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="MapUnit" 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="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1597,36 +1617,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1646,40 +1666,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1702,38 +1722,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1753,40 +1773,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1809,47 +1829,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1869,44 +1889,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1922,32 +1942,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="210,32,39,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1962,15 +1982,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1978,35 +1998,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="MapUnit" 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="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="210,32,39,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2037,36 +2057,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2086,40 +2106,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2142,38 +2162,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2193,40 +2213,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2249,1378 +2269,58 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="10" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="500"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="250"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="Interval"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="103,34,144,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="name" v="filled_arrowhead"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MapUnit"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="103,34,144,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="227,26,28,0"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
-              <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="MapUnit" 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="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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>
-              <prop k="align_dash_pattern" v="0"/>
-              <prop k="capstyle" v="square"/>
-              <prop k="customdash" v="5;2"/>
-              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="customdash_unit" v="MapUnit"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="103,34,144,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="LastVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="103,34,144,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="FirstVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="103,34,144,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-          </symbol>
-          <symbol alpha="1" frame_rate="10" name="3" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="500"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="250"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="Interval"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@3@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="145,211,55,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="name" v="filled_arrowhead"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MapUnit"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@3@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="145,211,55,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="145,211,55,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="227,26,28,0"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
-              <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="MapUnit" 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="145,211,55,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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>
-              <prop k="align_dash_pattern" v="0"/>
-              <prop k="capstyle" v="square"/>
-              <prop k="customdash" v="5;2"/>
-              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="customdash_unit" v="MapUnit"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="145,211,55,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="LastVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@3@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="145,211,55,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="FirstVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@3@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="145,211,55,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-          </symbol>
-          <symbol alpha="1" frame_rate="10" name="4" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="500"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="250"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="Interval"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@4@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,72,255,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="name" v="filled_arrowhead"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MapUnit"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@4@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,72,255,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="0,72,255,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="227,26,28,0"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
-              <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="MapUnit" 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="0,72,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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>
-              <prop k="align_dash_pattern" v="0"/>
-              <prop k="capstyle" v="square"/>
-              <prop k="customdash" v="5;2"/>
-              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="customdash_unit" v="MapUnit"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,72,255,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="LastVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@4@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="0,72,255,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="FirstVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@4@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="0,72,255,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-          </symbol>
-          <symbol alpha="1" frame_rate="10" name="5" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
-              <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="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3651,56 +2351,56 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="6" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="11" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.46" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.46"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3731,62 +2431,3582 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
+          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@2@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@3@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@3@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="145,211,55,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="145,211,55,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="145,211,55,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@3@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@3@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@4@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@4@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,72,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,72,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,72,255,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,72,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@4@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@4@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@5@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@5@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@5@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@5@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="6" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@6@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@6@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="210,32,39,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="210,32,39,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@6@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@6@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="7" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@7@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@7@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@7@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@7@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="8" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@8@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@8@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="145,211,55,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="145,211,55,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="145,211,55,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@8@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@8@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="9" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@9@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@9@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,72,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,72,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,72,255,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,72,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@9@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@9@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{4378179d-f926-41f4-9594-bdfa682c8a9f}">
-          <rule key="{573bc779-5c0e-4f9d-97f0-32cc9764b982}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes">
+        <rules key="{adefb6f1-8d28-439f-8c89-3617096e0e41}">
+          <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="{3d6b22ea-4051-4151-bae2-dc441215d183}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="round($length / 1000, 0)" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="round($length / 1000, 0)" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="164,113,88,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="164,113,88,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -3809,34 +6029,34 @@
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" 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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3851,98 +6071,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="km_marker()" quadOffset="3" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="LineGeometry" preserveRotation="1" geometryGeneratorEnabled="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="1" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="km_marker()" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="LineGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -3951,62 +6171,62 @@
       </labeling>
       <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="dualview/previewExpressions" type="List">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -4037,9 +6257,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4047,28 +6267,28 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4077,8 +6297,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4087,8 +6307,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4097,8 +6317,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4107,8 +6327,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4117,8 +6337,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4127,8 +6347,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4137,8 +6357,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4157,68 +6377,68 @@
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
         <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_m" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </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_m" index="10" name=""/>
-        <alias field="length_km" index="11" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_km" name="" index="10"/>
+        <alias field="length_m" name="" index="11"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="Sort" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <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"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="descriptio" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="timestamp" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="begin" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="end" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Distance" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="RouteLen" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Source" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Sort" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_m" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_km" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" desc="" exp=""/>
@@ -4231,31 +6451,31 @@
         <constraint field="Source" desc="" exp=""/>
         <constraint field="Sort" desc="" exp=""/>
         <constraint field="day" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
         <constraint field="length_km" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="integer" precision="0" length="6" comment="" expression="$length" subType="0" name="length_m" type="2"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="$length / 1000" subType="0" name="length_km" type="6"/>
+        <field length="-1" expression="$length * 100" precision="0" comment="" type="6" name="length_km" subType="0" typeName="double precision"/>
+        <field length="-1" expression="$length * 100 * 1000" precision="0" comment="" type="6" name="length_m" subType="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Name&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;length_m&quot;">
         <columns>
-          <column hidden="0" name="Name" type="field" width="152"/>
-          <column hidden="0" name="descriptio" type="field" width="-1"/>
-          <column hidden="0" name="timestamp" type="field" width="-1"/>
-          <column hidden="0" name="begin" type="field" width="163"/>
-          <column hidden="0" name="end" type="field" width="-1"/>
-          <column hidden="0" name="Distance" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="RouteLen" type="field" width="-1"/>
-          <column hidden="0" name="Source" type="field" width="-1"/>
-          <column hidden="0" name="length_m" type="field" width="-1"/>
-          <column hidden="0" name="Sort" type="field" width="-1"/>
-          <column hidden="0" name="day" type="field" width="-1"/>
-          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column type="field" name="Name" width="152" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="163" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="188" hidden="0"/>
+          <column type="field" name="Sort" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="266" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4287,18 +6507,18 @@ def my_form_open(dialog, layer, feature):
       <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="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -4315,25 +6535,25 @@ def my_form_open(dialog, layer, feature):
         <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="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></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -4406,58 +6626,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="196,60,57,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="196,60,57,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4488,36 +6708,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,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="140,43,41,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="196,60,57,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="140,43,41,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -4532,44 +6752,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,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="140,43,41,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="196,60,57,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="140,43,41,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -4592,54 +6812,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="183,72,75,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="183,72,75,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4670,9 +6890,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4683,19 +6903,19 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="ID" configurationFlags="None">
@@ -4721,19 +6941,19 @@ 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 field="ID" name="" index="0"/>
+        <alias field="height" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="ID" expression=""/>
-        <default applyOnUpdate="0" field="height" expression=""/>
-        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default expression="" field="ID" applyOnUpdate="0"/>
+        <default expression="" field="height" applyOnUpdate="0"/>
+        <default expression="" field="elevation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="ID" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="height" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="ID" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="height" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="elevation" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="ID" desc="" exp=""/>
@@ -4744,7 +6964,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4767,18 +6987,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Polygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Polygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
-        <xmax>18.42424810950425851</xmax>
-        <ymax>-33.8965939968351222</ymax>
+        <xmax>18.42666503715575743</xmax>
+        <ymax>-33.89693315858618661</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
-        <xmax>18.42424810950425851</xmax>
-        <ymax>-33.8965939968351222</ymax>
+        <xmax>18.42666503715575743</xmax>
+        <ymax>-33.89693315858618661</ymax>
       </wgs84extent>
       <id>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews</datasource>
@@ -4842,58 +7062,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="133,182,111,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="133,182,111,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4924,36 +7144,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,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="95,130,79,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="95,130,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -4968,44 +7188,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,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="95,130,79,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="95,130,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -5028,38 +7248,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -5074,9 +7294,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5087,21 +7307,21 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -5134,22 +7354,22 @@ 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 field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="page" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="page" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="page" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="page" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="page" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -5161,7 +7381,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -5184,7 +7404,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5249,7 +7469,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5274,58 +7494,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="190,178,151,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="190,178,151,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5356,36 +7576,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,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="136,127,108,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="190,178,151,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,127,108,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -5400,44 +7620,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,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="136,127,108,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="190,178,151,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,127,108,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -5460,54 +7680,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,85,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,85,255,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5538,9 +7758,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5551,32 +7771,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="Name" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="Name" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -5591,116 +7811,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="2" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="LineGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="LineGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="Name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="Name"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -5731,9 +7951,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5741,20 +7961,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -5773,16 +7993,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="Name" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="Name" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -5792,11 +8012,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="Name" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5828,8 +8048,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Name"/>
@@ -5841,7 +8061,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5906,7 +8126,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5931,58 +8151,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="145,82,45,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="145,82,45,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6013,36 +8233,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,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="104,59,32,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="145,82,45,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="104,59,32,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -6057,44 +8277,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,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="104,59,32,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="145,82,45,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="104,59,32,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -6117,48 +8337,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" label="21KM"/>
-          <rule symbol="1" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" label="10KM"/>
-          <rule symbol="2" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" label="5KM"/>
+          <rule symbol="0" label="21KM" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule symbol="1" label="10KM" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule symbol="2" label="5KM" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6178,40 +8398,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="miter" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" 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="210,32,39,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" 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="area" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="miter"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="210,32,39,255"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0.5"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="area"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -6234,32 +8454,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="100"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6279,44 +8499,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -6332,32 +8552,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@0@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@0@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,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="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="210,32,39,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -6372,9 +8592,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6382,35 +8602,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" 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="MapUnit" 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="miter" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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="MapUnit" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="210,32,39,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -6441,39 +8661,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6493,44 +8713,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -6546,32 +8766,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" 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="103,34,144,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="miter"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="103,34,144,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.5"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -6586,9 +8806,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6596,24 +8816,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="100"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6633,44 +8853,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -6686,32 +8906,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,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="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -6726,9 +8946,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6736,35 +8956,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" 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="miter" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -6795,39 +9015,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6847,44 +9067,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="69,100,25,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -6900,32 +9120,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="miter" 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="69,100,25,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="69,100,25,255"/>
+                        <Option type="QString" name="joinstyle" value="miter"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="69,100,25,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.5"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -6940,9 +9160,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6950,24 +9170,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="100"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6987,44 +9207,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="69,100,25,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -7040,32 +9260,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@2@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@2@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,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="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="69,100,25,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -7080,9 +9300,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7090,35 +9310,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" 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="MapUnit" 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="miter" name="joinstyle" type="QString"/>
-                <Option value="69,100,25,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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="MapUnit" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="69,100,25,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -7149,74 +9369,74 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <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 value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7247,9 +9467,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7257,20 +9477,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -7284,24 +9504,24 @@ 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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="Distance" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Distance" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -7311,11 +9531,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column hidden="0" name="Distance" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="id" type="field" width="-1"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7347,17 +9567,17 @@ def my_form_open(dialog, layer, feature):
       <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="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -7378,7 +9598,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7451,58 +9671,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="125,139,143,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="125,139,143,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7533,36 +9753,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,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="89,99,102,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="89,99,102,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -7577,44 +9797,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,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="89,99,102,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="89,99,102,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7637,46 +9857,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="0.796078" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="0.796078" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="227,0,185,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" 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="1" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="227,0,185,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="1"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7699,15 +9919,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7718,34 +9938,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )" 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 forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="8" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.4"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -7760,151 +9980,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Priority">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="8" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="1" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="1" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" 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 forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="227,0,185,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="4" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="227,0,185,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="4" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -7919,89 +10139,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="1" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="2"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -8010,194 +10230,194 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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 value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
+          <Option type="QString" name="labeling/angleOffset" value="0"/>
+          <Option type="QString" name="labeling/blendMode" value="0"/>
+          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
+          <Option type="QString" name="labeling/bufferColorA" value="255"/>
+          <Option type="QString" name="labeling/bufferColorB" value="255"/>
+          <Option type="QString" name="labeling/bufferColorG" value="255"/>
+          <Option type="QString" name="labeling/bufferColorR" value="255"/>
+          <Option type="QString" name="labeling/bufferDraw" value="false"/>
+          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
+          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
+          <Option type="QString" name="labeling/bufferSize" value="1"/>
+          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/bufferTransp" value="0"/>
+          <Option type="QString" name="labeling/centroidInside" value="false"/>
+          <Option type="QString" name="labeling/centroidWhole" value="false"/>
+          <Option type="QString" name="labeling/decimals" value="3"/>
+          <Option type="QString" name="labeling/displayAll" value="false"/>
+          <Option type="QString" name="labeling/dist" value="0"/>
+          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/drawLabels" value="false"/>
+          <Option type="QString" name="labeling/enabled" value="false"/>
+          <Option type="QString" name="labeling/fieldName" value="position"/>
+          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
+          <Option type="QString" name="labeling/fontCapitals" value="0"/>
+          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
+          <Option type="QString" name="labeling/fontItalic" value="false"/>
+          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
+          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
+          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
+          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
+          <Option type="QString" name="labeling/fontSize" value="10"/>
+          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
+          <Option type="QString" name="labeling/fontUnderline" value="false"/>
+          <Option type="QString" name="labeling/fontWeight" value="63"/>
+          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
+          <Option type="QString" name="labeling/formatNumbers" value="false"/>
+          <Option type="QString" name="labeling/isExpression" value="false"/>
+          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
+          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/labelPerPart" value="false"/>
+          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
+          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
+          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
+          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
+          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
+          <Option type="QString" name="labeling/mergeLines" value="false"/>
+          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
+          <Option type="QString" name="labeling/multilineAlign" value="0"/>
+          <Option type="QString" name="labeling/multilineHeight" value="1"/>
+          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
+          <Option type="QString" name="labeling/obstacle" value="true"/>
+          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
+          <Option type="QString" name="labeling/obstacleType" value="0"/>
+          <Option type="QString" name="labeling/offsetType" value="0"/>
+          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
+          <Option type="QString" name="labeling/placement" value="0"/>
+          <Option type="QString" name="labeling/placementFlags" value="10"/>
+          <Option type="QString" name="labeling/plussign" value="false"/>
+          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option type="QString" name="labeling/preserveRotation" value="true"/>
+          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
+          <Option type="QString" name="labeling/priority" value="5"/>
+          <Option type="QString" name="labeling/quadOffset" value="4"/>
+          <Option type="QString" name="labeling/repeatDistance" value="0"/>
+          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
+          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
+          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
+          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
+          <Option type="QString" name="labeling/scaleMin" value="1"/>
+          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
+          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
+          <Option type="QString" name="labeling/shadowColorB" value="0"/>
+          <Option type="QString" name="labeling/shadowColorG" value="0"/>
+          <Option type="QString" name="labeling/shadowColorR" value="0"/>
+          <Option type="QString" name="labeling/shadowDraw" value="false"/>
+          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
+          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
+          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
+          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
+          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
+          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
+          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
+          <Option type="QString" name="labeling/shadowScale" value="100"/>
+          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
+          <Option type="QString" name="labeling/shadowUnder" value="0"/>
+          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
+          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
+          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
+          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeDraw" value="true"/>
+          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
+          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
+          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
+          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
+          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
+          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
+          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
+          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
+          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
+          <Option type="QString" name="labeling/shapeRotation" value="0"/>
+          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
+          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
+          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
+          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
+          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
+          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
+          <Option type="QString" name="labeling/shapeType" value="0"/>
+          <Option type="QString" name="labeling/textColorA" value="255"/>
+          <Option type="QString" name="labeling/textColorB" value="255"/>
+          <Option type="QString" name="labeling/textColorG" value="255"/>
+          <Option type="QString" name="labeling/textColorR" value="255"/>
+          <Option type="QString" name="labeling/textTransp" value="0"/>
+          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
+          <Option type="QString" name="labeling/wrapChar" value=""/>
+          <Option type="QString" name="labeling/xOffset" value="0"/>
+          <Option type="QString" name="labeling/yOffset" value="0"/>
+          <Option type="QString" name="labeling/zIndex" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -8228,9 +10448,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8238,28 +10458,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="10" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="10" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -8268,8 +10488,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -8278,27 +10498,27 @@ 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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" 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 field="id" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="position" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -8309,12 +10529,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="position" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="position" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8390,7 +10610,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Polygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Polygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8465,58 +10685,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="164,113,88,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="164,113,88,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8547,36 +10767,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,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="117,81,63,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="164,113,88,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="117,81,63,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -8591,44 +10811,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,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="117,81,63,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="164,113,88,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="117,81,63,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8651,38 +10871,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,85,0,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="0,85,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,85,0,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,85,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="b_diagonal"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -8697,9 +10917,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8710,60 +10930,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="name"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -8794,9 +11014,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8804,20 +11024,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="1" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="name" configurationFlags="None">
@@ -8857,25 +11077,25 @@ 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="cone_len" index="3" name=""/>
-        <alias field="fence_len" index="4" name=""/>
+        <alias field="name" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="cone_len" name="" index="3"/>
+        <alias field="fence_len" name="" index="4"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="group" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="cone_len" expression=""/>
-        <default applyOnUpdate="0" field="fence_len" expression=""/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="group" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="cone_len" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="fence_len" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="group" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="cone_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="fence_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="name" desc="" exp=""/>
@@ -8888,14 +11108,14 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="name" type="field" width="-1"/>
-          <column hidden="0" name="group" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="cone_len" type="field" width="-1"/>
-          <column hidden="0" name="fence_len" type="field" width="-1"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="group" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="cone_len" width="-1" hidden="0"/>
+          <column type="field" name="fence_len" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8927,8 +11147,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="group"/>
@@ -8940,7 +11160,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -9005,7 +11225,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9019,26 +11239,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" name="fence_len" type="6"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" name="fence_len" type="6"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" name="cone_len" type="6"/>
+        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis version="3.8.3-Zanzibar" maxScale="0" simplifyDrawingTol="1" simplifyAlgorithm="0" simplifyLocal="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" readOnly="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" minScale="1e+08">
+          <qgis labelsEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyLocal="1" readOnly="0" simplifyMaxScale="1" minScale="1e+08" maxScale="0" simplifyDrawingHints="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" forceraster="0" type="RuleRenderer" enableorderby="0">
+            <renderer-v2 type="RuleRenderer" symbollevels="1" enableorderby="0" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible"/>
+                <rule symbol="0" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol alpha="1" name="0" clip_to_extent="1" force_rhr="0" type="line">
-                  <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                <symbol alpha="1" type="line" name="0" clip_to_extent="1" force_rhr="0">
+                  <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                     <prop k="capstyle" v="square"/>
                     <prop k="customdash" v="5;2"/>
                     <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9057,9 +11277,9 @@ def my_form_open(dialog, layer, feature):
                     <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -9068,64 +11288,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fieldName="comment" fontWeight="50" fontLetterSpacing="0" fontCapitals="0" namedStyle="Regular" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" fontStrikeout="0" fontSize="11" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOpacity="0.8" fontSizeUnit="Point" isExpression="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontUnderline="0">
-                      <text-buffer bufferDraw="0" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-                      <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.6" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM"/>
-                      <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                    <text-style textColor="0,0,0,255" fontUnderline="0" fontCapitals="0" blendMode="0" fieldName="comment" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="#ffffff" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" isExpression="0" textOpacity="0.8" fontStrikeout="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point">
+                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+                      <background shapeType="0" shapeBlendMode="0" shapeBorderWidth="0.6" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.6" shapeOffsetX="0"/>
+                      <shadow shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" reverseDirectionSymbol="0" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1"/>
-                    <placement offsetUnits="MM" maxCurvedCharAngleIn="25" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" placementFlags="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistance="0" centroidInside="0" yOffset="0" placement="4" priority="5" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetType="0" rotationAngle="0" xOffset="0" dist="5" distUnits="MM" centroidWhole="0"/>
-                    <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="1" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" displayAll="1" zIndex="0"/>
+                    <text-format leftDirectionSymbol="&lt;" addDirectionSymbol="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" priority="5" distUnits="MM" dist="5" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" offsetUnits="MM" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" fitInPolygonOnly="0" centroidWhole="0" placement="4" placementFlags="2" xOffset="0" centroidInside="0" rotationAngle="0" geometryGenerator="" geometryGeneratorType="PointGeometry" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                    <rendering displayAll="1" scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" 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 type="QString" name="name" value=""/>
+                        <Option type="Map" name="properties">
+                          <Option type="Map" name="PositionX">
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                            <Option type="int" name="type" value="2"/>
                           </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 type="Map" name="PositionY">
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fieldName="round( $length, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" fontCapitals="0" namedStyle="Semibold" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOpacity="1" fontSizeUnit="Point" isExpression="1" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontUnderline="0">
-                      <text-buffer bufferDraw="1" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-                      <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM"/>
-                      <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                    <text-style textColor="0,0,0,255" fontUnderline="0" fontCapitals="0" blendMode="0" fieldName="round( $length, 1) || 'm'" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="#ffffff" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" isExpression="1" textOpacity="1" fontStrikeout="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point">
+                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+                      <background shapeType="0" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0"/>
+                      <shadow shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" reverseDirectionSymbol="0" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1"/>
-                    <placement offsetUnits="MM" maxCurvedCharAngleIn="25" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" placementFlags="15" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistance="0" centroidInside="0" yOffset="0" placement="2" priority="5" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetType="0" rotationAngle="0" xOffset="0" dist="1" distUnits="MM" centroidWhole="0"/>
-                    <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" displayAll="0" zIndex="0"/>
+                    <text-format leftDirectionSymbol="&lt;" addDirectionSymbol="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" priority="5" distUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" offsetUnits="MM" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" fitInPolygonOnly="0" centroidWhole="0" placement="2" placementFlags="15" xOffset="0" centroidInside="0" rotationAngle="0" geometryGenerator="" geometryGeneratorType="PointGeometry" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                    <rendering displayAll="0" scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" 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 type="QString" name="name" value=""/>
+                        <Option type="Map" name="properties">
+                          <Option type="Map" name="PositionX">
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                            <Option type="int" name="type" value="2"/>
                           </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 type="Map" name="PositionY">
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -9141,22 +11361,22 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory scaleBasedVisibility="0" backgroundColor="#ffffff" lineSizeType="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" minScaleDenominator="0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" penWidth="0" penAlpha="255">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory sizeType="MM" opacity="1" diagramOrientation="Up" backgroundAlpha="255" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" lineSizeType="MM" enabled="0" penAlpha="255" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" rotationOffset="270" minimumSize="0" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" barWidth="5" penWidth="0">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
                 <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+            <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" dist="0" placement="2">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -9240,45 +11460,45 @@ 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 field="id" name="" index="0"/>
+              <alias field="group" name="" index="1"/>
+              <alias field="comment" name="" index="2"/>
+              <alias field="moveable" name="" index="3"/>
+              <alias field="type" name="" index="4"/>
+              <alias field="name" name="" index="5"/>
+              <alias field="hidden" name="" index="6"/>
+              <alias field="auxiliary_storage_labeling_positiony" name="" index="7"/>
+              <alias field="auxiliary_storage_labeling_positionx" name="" index="8"/>
+              <alias field="fence_len" name="" index="9"/>
+              <alias field="cone_len" name="" index="10"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default applyOnUpdate="0" field="id" expression=""/>
-              <default applyOnUpdate="0" field="group" expression=""/>
-              <default applyOnUpdate="0" field="comment" expression=""/>
-              <default applyOnUpdate="0" field="moveable" expression=""/>
-              <default applyOnUpdate="0" field="type" expression=""/>
-              <default applyOnUpdate="0" field="name" expression=""/>
-              <default applyOnUpdate="0" field="hidden" expression=""/>
-              <default applyOnUpdate="0" field="auxiliary_storage_labeling_positiony" expression=""/>
-              <default applyOnUpdate="0" field="auxiliary_storage_labeling_positionx" expression=""/>
-              <default applyOnUpdate="0" field="fence_len" expression=""/>
-              <default applyOnUpdate="0" field="cone_len" expression=""/>
+              <default expression="" field="id" applyOnUpdate="0"/>
+              <default expression="" field="group" applyOnUpdate="0"/>
+              <default expression="" field="comment" applyOnUpdate="0"/>
+              <default expression="" field="moveable" applyOnUpdate="0"/>
+              <default expression="" field="type" applyOnUpdate="0"/>
+              <default expression="" field="name" applyOnUpdate="0"/>
+              <default expression="" field="hidden" applyOnUpdate="0"/>
+              <default expression="" field="auxiliary_storage_labeling_positiony" applyOnUpdate="0"/>
+              <default expression="" field="auxiliary_storage_labeling_positionx" applyOnUpdate="0"/>
+              <default expression="" field="fence_len" applyOnUpdate="0"/>
+              <default expression="" field="cone_len" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="group" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="comment" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="moveable" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="hidden" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="auxiliary_storage_labeling_positiony" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="auxiliary_storage_labeling_positionx" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="fence_len" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="cone_len" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="comment" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="moveable" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="hidden" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
               <constraint field="id" desc="" exp=""/>
@@ -9294,27 +11514,27 @@ def my_form_open(dialog, layer, feature):
               <constraint field="cone_len" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" name="fence_len" type="6"/>
-              <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" name="fence_len" type="6"/>
-              <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" name="cone_len" type="6"/>
+              <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
             </expressionfields>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
               <columns>
-                <column hidden="0" name="id" type="field" width="-1"/>
-                <column hidden="0" name="group" type="field" width="-1"/>
-                <column hidden="1" type="actions" width="-1"/>
-                <column hidden="0" name="comment" type="field" width="223"/>
-                <column hidden="0" name="moveable" type="field" width="-1"/>
-                <column hidden="0" name="type" type="field" width="-1"/>
-                <column hidden="0" name="name" type="field" width="414"/>
-                <column hidden="0" name="hidden" type="field" width="-1"/>
-                <column hidden="0" name="fence_len" type="field" width="-1"/>
-                <column hidden="0" name="cone_len" type="field" width="-1"/>
-                <column hidden="1" name="auxiliary_storage_labeling_positiony" type="field" width="-1"/>
-                <column hidden="1" name="auxiliary_storage_labeling_positionx" type="field" width="-1"/>
+                <column type="field" name="id" width="-1" hidden="0"/>
+                <column type="field" name="group" width="-1" hidden="0"/>
+                <column type="actions" width="-1" hidden="1"/>
+                <column type="field" name="comment" width="223" hidden="0"/>
+                <column type="field" name="moveable" width="-1" hidden="0"/>
+                <column type="field" name="type" width="-1" hidden="0"/>
+                <column type="field" name="name" width="414" hidden="0"/>
+                <column type="field" name="hidden" width="-1" hidden="0"/>
+                <column type="field" name="fence_len" width="-1" hidden="0"/>
+                <column type="field" name="cone_len" width="-1" hidden="0"/>
+                <column type="field" name="auxiliary_storage_labeling_positiony" width="-1" hidden="1"/>
+                <column type="field" name="auxiliary_storage_labeling_positionx" width="-1" hidden="1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -9345,18 +11565,18 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -9387,58 +11607,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="133,182,111,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="133,182,111,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9469,36 +11689,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,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="95,130,79,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="95,130,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -9513,44 +11733,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,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="95,130,79,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="95,130,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9573,64 +11793,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="1" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="1" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps">
-            <rule symbol="0" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones"/>
-            <rule symbol="1" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences"/>
-            <rule symbol="2" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences"/>
-            <rule symbol="3" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr')" checkstate="0" label="Construction"/>
+          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule symbol="3" label="Construction" checkstate="0" filter="regexp_match(&quot;type&quot;, '^constr')" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule symbol="4" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0" label="Is Visible"/>
+          <rule symbol="4" label="Is Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
           <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="1;4" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="Point" 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="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dot" name="line_style" type="QString"/>
-                <Option value="1" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="round"/>
+                <Option type="QString" name="customdash" value="1;4"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="Point"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="255,255,0,255"/>
+                <Option type="QString" name="line_style" value="dot"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -9661,56 +11881,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="4;3" 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="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="round"/>
+                <Option type="QString" name="customdash" value="4;3"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="255,255,0,255"/>
+                <Option type="QString" name="line_style" value="dash"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -9741,56 +11961,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="255,255,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.8"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9821,56 +12041,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="3" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,0,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,255,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.8"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9901,56 +12121,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="4" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="255,255,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9981,50 +12201,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="5" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="213,180,60,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10055,9 +12275,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10066,34 +12286,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="comment" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="11" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.80000000000000004" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="comment" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.80000000000000004" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="0.59999999999999998" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="round" 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="255,255,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.6" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="255,255,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.6"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10108,110 +12328,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" 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 type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                        <Option type="int" name="type" value="2"/>
                       </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 type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="2" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="5" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="14" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1.8200000000000001" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="1" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="5" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1.8200000000000001" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" 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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                      <Option type="int" name="type" value="2"/>
                     </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 type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{226e1338-ed15-4fc8-a035-fefee03c38d6}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="round( $length, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="11" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="round( $length, 1) || 'm'" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10226,88 +12446,88 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="expression" value="1"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <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 type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                        <Option type="int" name="type" value="2"/>
                       </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 type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-25" priority="6" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="2" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="1" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="14" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="6" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="1"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <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 type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                      <Option type="int" name="type" value="2"/>
                     </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 type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -10316,60 +12536,60 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10400,9 +12620,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10410,20 +12630,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -10491,37 +12711,37 @@ 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="fence_len" index="7" name=""/>
-        <alias field="cone_len" index="8" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="comment" name="" index="2"/>
+        <alias field="moveable" name="" index="3"/>
+        <alias field="type" name="" index="4"/>
+        <alias field="name" name="" index="5"/>
+        <alias field="hidden" name="" index="6"/>
+        <alias field="fence_len" name="" index="7"/>
+        <alias field="cone_len" name="" index="8"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="group" expression=""/>
-        <default applyOnUpdate="0" field="comment" expression=""/>
-        <default applyOnUpdate="0" field="moveable" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="hidden" expression=""/>
-        <default applyOnUpdate="0" field="fence_len" expression=""/>
-        <default applyOnUpdate="0" field="cone_len" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="comment" applyOnUpdate="0"/>
+        <default expression="" field="moveable" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="hidden" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="group" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="moveable" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="hidden" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="fence_len" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="cone_len" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="group" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="comment" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="moveable" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="hidden" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="fence_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="cone_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -10535,25 +12755,25 @@ def my_form_open(dialog, layer, feature):
         <constraint field="cone_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" name="fence_len" type="6"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" name="fence_len" type="6"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" name="cone_len" type="6"/>
+        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="group" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="comment" type="field" width="373"/>
-          <column hidden="0" name="moveable" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="name" type="field" width="692"/>
-          <column hidden="0" name="hidden" type="field" width="-1"/>
-          <column hidden="0" name="fence_len" type="field" width="-1"/>
-          <column hidden="0" name="cone_len" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="group" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="comment" width="373" hidden="0"/>
+          <column type="field" name="moveable" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="name" width="692" hidden="0"/>
+          <column type="field" name="hidden" width="-1" hidden="0"/>
+          <column type="field" name="fence_len" width="-1" hidden="0"/>
+          <column type="field" name="cone_len" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10585,18 +12805,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -10618,7 +12838,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10691,58 +12911,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="164,113,88,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="164,113,88,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10773,36 +12993,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,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="117,81,63,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="164,113,88,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="117,81,63,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -10817,44 +13037,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,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="117,81,63,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="164,113,88,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="117,81,63,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10877,54 +13097,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,178,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,178,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10955,9 +13175,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10968,60 +13188,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11052,9 +13272,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11062,20 +13282,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -11087,13 +13307,13 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias field="id" name="" index="0"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -11102,10 +13322,10 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11137,7 +13357,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -11148,18 +13368,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiPolygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.95934132149262297</ymin>
-        <xmax>18.42432608246585701</xmax>
-        <ymax>-33.8965939968351222</ymax>
+        <ymin>-33.95871753779982782</ymin>
+        <xmax>18.42666503715575743</xmax>
+        <ymax>-33.89693315858618661</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.95934132149262297</ymin>
-        <xmax>18.42432608246585701</xmax>
-        <ymax>-33.8965939968351222</ymax>
+        <ymin>-33.95871753779982782</ymin>
+        <xmax>18.42666503715575743</xmax>
+        <ymax>-33.89693315858618661</ymax>
       </wgs84extent>
       <id>marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51</id>
       <datasource>./marshal overviews.shp|layername=marshal overviews</datasource>
@@ -11221,58 +13441,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="213,180,60,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="213,180,60,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11303,36 +13523,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="213,180,60,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="152,129,43,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="213,180,60,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="152,129,43,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -11347,44 +13567,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="213,180,60,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="152,129,43,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="213,180,60,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="152,129,43,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11407,38 +13627,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="26,0,201,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="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="dot" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="26,0,201,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="dot"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="b_diagonal"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -11453,9 +13673,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11466,65 +13686,69 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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="dualview/previewExpressions" type="List">
-            <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <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" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11555,9 +13779,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11565,34 +13789,34 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option value="true" name="active" type="bool"/>
-                <Option value="id" name="field" type="QString"/>
-                <Option value="2" name="type" type="int"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11601,8 +13825,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11611,8 +13835,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11626,22 +13850,22 @@ 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 field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="page" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="page" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="page" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="page" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="page" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -11653,13 +13877,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;page&quot;">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="day" type="field" width="-1"/>
-          <column hidden="0" name="page" type="field" width="-1"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="page" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11691,9 +13915,9 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -11706,7 +13930,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -11771,7 +13995,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11782,7 +14006,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join upsertOnEdit="0" memoryCache="0" cascadedDelete="0" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" editable="0" hasCustomPrefix="1" dynamicForm="0" customPrefix="csv_" joinFieldName="position">
+        <join cascadedDelete="0" joinFieldName="position" memoryCache="0" editable="0" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="0" customPrefix="csv_" hasCustomPrefix="1">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -11809,58 +14033,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="id" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="id" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="114,155,111,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="114,155,111,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11891,36 +14115,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,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="81,111,79,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="114,155,111,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="81,111,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -11935,44 +14159,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="114,155,111,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="81,111,79,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="114,155,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="81,111,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11995,51 +14219,51 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" label="Always show in marshal overview"/>
-          <rule symbol="1" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" label="Show in marshal overview"/>
-          <rule symbol="2" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" description="Show in marshal overview" checkstate="0" label="Show in marshal maps"/>
+          <rule symbol="0" label="Show by day in marshal plan" 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 symbol="1" label="Always show in marshal plan" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule symbol="2" label="Show in marshal maps" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" description="Show in marshal overview" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol alpha="0.792157" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="0.8" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="0,0,0,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="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="5"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="Pixel"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -12062,42 +14286,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="0.792157" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="0.8" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="0,0,0,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="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="5"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="Pixel"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -12120,42 +14344,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="0.01" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="0.01" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" 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="0.1" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="0.1"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -12178,9 +14402,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12188,43 +14412,43 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{8d8bf0e7-537f-4704-ade2-f0f6492cc7eb}">
-          <rule key="{2039cbe3-738a-42d9-9a8c-d8770eecca08}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+        <rules key="{a69c392f-7c45-4a75-a992-731572d96e04}">
+          <rule active="0" 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="{500cb2dd-2062-4b02-bba6-05c13c814f8b}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="6" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="231,113,72,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -12247,34 +14471,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12289,110 +14513,286 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="1" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="PointGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="2"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{47a8bd63-bf65-4c59-961d-6916df289a29}" 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">
+          <rule 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="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="6" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.5" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="231,113,72,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="231,113,72,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="255,255,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="0,0,0,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.1"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <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="{a55220d0-6cca-4356-8b73-4d8675ee164b}">
+            <settings calloutType="simple">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.5" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <families/>
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.4"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12407,181 +14807,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="FontOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="FontOpacity">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="FontStyle" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Priority">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="ShapeOpacity">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="1" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="8" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1.8" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="5"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{d8764302-827c-43a5-be63-465b96e23498}" 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 inactive labels below active label">
+          <rule active="0" 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 inactive labels below active label" key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="6" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.59999999999999998" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.59999999999999998" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.4"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12596,181 +14996,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="FontOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="FontOpacity">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="Priority">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ShapeOpacity">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="1" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="8" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1.8" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="5"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{81445dc3-bc05-47bf-8749-b1306c7050f3}" 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">
+          <rule active="0" 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="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="8" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,0,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.90000000000000002" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,0,255" shapeOpacity="0.90000000000000002" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,0,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,0,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.4"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -12785,149 +15185,149 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="FontOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="FontOpacity">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="Priority">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ShapeOpacity">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="1" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1.8" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="10"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="10" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -12936,200 +15336,202 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="dualview/previewExpressions" type="List">
-            <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <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" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
+          <Option type="QString" name="labeling/angleOffset" value="0"/>
+          <Option type="QString" name="labeling/blendMode" value="0"/>
+          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
+          <Option type="QString" name="labeling/bufferColorA" value="255"/>
+          <Option type="QString" name="labeling/bufferColorB" value="255"/>
+          <Option type="QString" name="labeling/bufferColorG" value="255"/>
+          <Option type="QString" name="labeling/bufferColorR" value="255"/>
+          <Option type="QString" name="labeling/bufferDraw" value="false"/>
+          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
+          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
+          <Option type="QString" name="labeling/bufferSize" value="1"/>
+          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/bufferTransp" value="0"/>
+          <Option type="QString" name="labeling/centroidInside" value="false"/>
+          <Option type="QString" name="labeling/centroidWhole" value="false"/>
+          <Option type="QString" name="labeling/decimals" value="3"/>
+          <Option type="QString" name="labeling/displayAll" value="false"/>
+          <Option type="QString" name="labeling/dist" value="0"/>
+          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/drawLabels" value="false"/>
+          <Option type="QString" name="labeling/enabled" value="false"/>
+          <Option type="QString" name="labeling/fieldName" value="position"/>
+          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
+          <Option type="QString" name="labeling/fontCapitals" value="0"/>
+          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
+          <Option type="QString" name="labeling/fontItalic" value="false"/>
+          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
+          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
+          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
+          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
+          <Option type="QString" name="labeling/fontSize" value="10"/>
+          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
+          <Option type="QString" name="labeling/fontUnderline" value="false"/>
+          <Option type="QString" name="labeling/fontWeight" value="63"/>
+          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
+          <Option type="QString" name="labeling/formatNumbers" value="false"/>
+          <Option type="QString" name="labeling/isExpression" value="false"/>
+          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
+          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/labelPerPart" value="false"/>
+          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
+          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
+          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
+          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
+          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
+          <Option type="QString" name="labeling/mergeLines" value="false"/>
+          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
+          <Option type="QString" name="labeling/multilineAlign" value="0"/>
+          <Option type="QString" name="labeling/multilineHeight" value="1"/>
+          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
+          <Option type="QString" name="labeling/obstacle" value="true"/>
+          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
+          <Option type="QString" name="labeling/obstacleType" value="0"/>
+          <Option type="QString" name="labeling/offsetType" value="0"/>
+          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
+          <Option type="QString" name="labeling/placement" value="0"/>
+          <Option type="QString" name="labeling/placementFlags" value="10"/>
+          <Option type="QString" name="labeling/plussign" value="false"/>
+          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option type="QString" name="labeling/preserveRotation" value="true"/>
+          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
+          <Option type="QString" name="labeling/priority" value="5"/>
+          <Option type="QString" name="labeling/quadOffset" value="4"/>
+          <Option type="QString" name="labeling/repeatDistance" value="0"/>
+          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
+          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
+          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
+          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
+          <Option type="QString" name="labeling/scaleMin" value="1"/>
+          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
+          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
+          <Option type="QString" name="labeling/shadowColorB" value="0"/>
+          <Option type="QString" name="labeling/shadowColorG" value="0"/>
+          <Option type="QString" name="labeling/shadowColorR" value="0"/>
+          <Option type="QString" name="labeling/shadowDraw" value="false"/>
+          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
+          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
+          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
+          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
+          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
+          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
+          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
+          <Option type="QString" name="labeling/shadowScale" value="100"/>
+          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
+          <Option type="QString" name="labeling/shadowUnder" value="0"/>
+          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
+          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
+          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
+          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeDraw" value="true"/>
+          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
+          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
+          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
+          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
+          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
+          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
+          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
+          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
+          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
+          <Option type="QString" name="labeling/shapeRotation" value="0"/>
+          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
+          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
+          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
+          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
+          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
+          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
+          <Option type="QString" name="labeling/shapeType" value="0"/>
+          <Option type="QString" name="labeling/textColorA" value="255"/>
+          <Option type="QString" name="labeling/textColorB" value="255"/>
+          <Option type="QString" name="labeling/textColorG" value="255"/>
+          <Option type="QString" name="labeling/textColorR" value="255"/>
+          <Option type="QString" name="labeling/textTransp" value="0"/>
+          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
+          <Option type="QString" name="labeling/wrapChar" value=""/>
+          <Option type="QString" name="labeling/xOffset" value="0"/>
+          <Option type="QString" name="labeling/yOffset" value="0"/>
+          <Option type="QString" name="labeling/zIndex" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13160,9 +15562,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13170,28 +15572,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13200,8 +15602,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13210,8 +15612,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13220,8 +15622,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13230,8 +15632,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13254,8 +15656,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13304,52 +15706,52 @@ 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="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_position" index="6" name=""/>
-        <alias field="csv_club" index="7" name=""/>
-        <alias field="csv_firstname" index="8" name=""/>
-        <alias field="csv_surname" index="9" name=""/>
-        <alias field="csv_days" index="10" name=""/>
-        <alias field="csv_first_runner" index="11" name=""/>
-        <alias field="csv_last_runner" index="12" name=""/>
-        <alias field="csv_instructions" index="13" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="notes" name="" index="3"/>
+        <alias field="xyposition" name="" index="4"/>
+        <alias field="day" name="" index="5"/>
+        <alias field="csv_position" name="" index="6"/>
+        <alias field="csv_club" name="" index="7"/>
+        <alias field="csv_firstname" name="" index="8"/>
+        <alias field="csv_surname" name="" index="9"/>
+        <alias field="csv_days" name="" index="10"/>
+        <alias field="csv_first_runner" name="" index="11"/>
+        <alias field="csv_last_runner" name="" index="12"/>
+        <alias field="csv_instructions" name="" index="13"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="notes" expression=""/>
-        <default applyOnUpdate="0" field="xyposition" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="csv_position" expression=""/>
-        <default applyOnUpdate="0" field="csv_club" expression=""/>
-        <default applyOnUpdate="0" field="csv_firstname" expression=""/>
-        <default applyOnUpdate="0" field="csv_surname" expression=""/>
-        <default applyOnUpdate="0" field="csv_days" expression=""/>
-        <default applyOnUpdate="0" field="csv_first_runner" expression=""/>
-        <default applyOnUpdate="0" field="csv_last_runner" expression=""/>
-        <default applyOnUpdate="0" field="csv_instructions" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="notes" applyOnUpdate="0"/>
+        <default expression="" field="xyposition" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
+        <default expression="" field="csv_position" applyOnUpdate="0"/>
+        <default expression="" field="csv_club" applyOnUpdate="0"/>
+        <default expression="" field="csv_firstname" applyOnUpdate="0"/>
+        <default expression="" field="csv_surname" applyOnUpdate="0"/>
+        <default expression="" field="csv_days" applyOnUpdate="0"/>
+        <default expression="" field="csv_first_runner" applyOnUpdate="0"/>
+        <default expression="" field="csv_last_runner" applyOnUpdate="0"/>
+        <default expression="" field="csv_instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="position" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="notes" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="xyposition" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_position" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_club" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_firstname" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_surname" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_days" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_first_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_last_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_instructions" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="notes" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="xyposition" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_club" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_firstname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_surname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_days" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_first_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_last_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_instructions" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -13371,23 +15773,23 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;day&quot;" sortOrder="1">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="position" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="notes" type="field" width="-1"/>
-          <column hidden="0" name="xyposition" type="field" width="-1"/>
-          <column hidden="0" name="csv_club" type="field" width="-1"/>
-          <column hidden="0" name="csv_first_runner" type="field" width="-1"/>
-          <column hidden="0" name="csv_last_runner" type="field" width="-1"/>
-          <column hidden="0" name="csv_firstname" type="field" width="-1"/>
-          <column hidden="0" name="csv_surname" type="field" width="-1"/>
-          <column hidden="0" name="csv_position" type="field" width="-1"/>
-          <column hidden="0" name="csv_days" type="field" width="-1"/>
-          <column hidden="0" name="day" type="field" width="-1"/>
-          <column hidden="0" name="csv_instructions" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="position" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="notes" width="-1" hidden="0"/>
+          <column type="field" name="xyposition" width="-1" hidden="0"/>
+          <column type="field" name="csv_club" width="-1" hidden="0"/>
+          <column type="field" name="csv_first_runner" width="-1" hidden="0"/>
+          <column type="field" name="csv_last_runner" width="-1" hidden="0"/>
+          <column type="field" name="csv_firstname" width="-1" hidden="0"/>
+          <column type="field" name="csv_surname" width="-1" hidden="0"/>
+          <column type="field" name="csv_position" width="-1" hidden="0"/>
+          <column type="field" name="csv_days" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="csv_instructions" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13419,40 +15821,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_email"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_days"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_email" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_days" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="csv_10_distance"/>
@@ -13491,27 +15893,27 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="xyposition"/>
       </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_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_races"/>
-        <field reuseLastValue="0" name="csv_surname"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <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_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_races" reuseLastValue="0"/>
+        <field name="csv_surname" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" 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>
@@ -13561,7 +15963,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="100000" styleCategories="AllStyleCategories" geometry="No geometry" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" autoRefreshTime="0" wkbType="NoGeometry" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" minScale="1e+08">
+    <maplayer geometry="No geometry" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" minScale="1e+08" autoRefreshEnabled="0" wkbType="NoGeometry" maxScale="100000" refreshOnNotifyMessage="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -13614,7 +16016,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13627,8 +16029,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="marshal_positions20160930121322287"/>
         <layer id="all_routes20170907054841602"/>
+        <layer id="marshal_positions20160930121322287"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -13642,58 +16044,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="243,166,178,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13724,36 +16126,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="243,166,178,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="174,119,127,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -13768,44 +16170,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="243,166,178,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="174,119,127,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13828,9 +16230,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13839,28 +16241,28 @@ 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 value="first_name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="first_name"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13869,8 +16271,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13893,8 +16295,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13903,8 +16305,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13913,8 +16315,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13923,8 +16325,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13954,8 +16356,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13983,55 +16385,55 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" index="0" name=""/>
-        <alias field="club" index="1" name=""/>
-        <alias field="firstname" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="name" 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="captain_email" index="9" name=""/>
-        <alias field="days" index="10" name=""/>
-        <alias field="races" index="11" name=""/>
-        <alias field="first_runner" index="12" name=""/>
-        <alias field="last_runner" index="13" name=""/>
-        <alias field="instructions" index="14" name=""/>
+        <alias field="position" name="" index="0"/>
+        <alias field="club" name="" index="1"/>
+        <alias field="firstname" name="" index="2"/>
+        <alias field="surname" name="" index="3"/>
+        <alias field="name" name="" index="4"/>
+        <alias field="phone" name="" index="5"/>
+        <alias field="email" name="" index="6"/>
+        <alias field="captain" name="" index="7"/>
+        <alias field="captain_phone" name="" index="8"/>
+        <alias field="captain_email" name="" index="9"/>
+        <alias field="days" name="" index="10"/>
+        <alias field="races" name="" index="11"/>
+        <alias field="first_runner" name="" index="12"/>
+        <alias field="last_runner" name="" index="13"/>
+        <alias field="instructions" name="" index="14"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="club" expression=""/>
-        <default applyOnUpdate="0" field="firstname" expression=""/>
-        <default applyOnUpdate="0" field="surname" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="phone" expression=""/>
-        <default applyOnUpdate="0" field="email" expression=""/>
-        <default applyOnUpdate="0" field="captain" expression=""/>
-        <default applyOnUpdate="0" field="captain_phone" expression=""/>
-        <default applyOnUpdate="0" field="captain_email" expression=""/>
-        <default applyOnUpdate="0" field="days" expression=""/>
-        <default applyOnUpdate="0" field="races" expression=""/>
-        <default applyOnUpdate="0" field="first_runner" expression=""/>
-        <default applyOnUpdate="0" field="last_runner" expression=""/>
-        <default applyOnUpdate="0" field="instructions" expression=""/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="club" applyOnUpdate="0"/>
+        <default expression="" field="firstname" applyOnUpdate="0"/>
+        <default expression="" field="surname" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="phone" applyOnUpdate="0"/>
+        <default expression="" field="email" applyOnUpdate="0"/>
+        <default expression="" field="captain" applyOnUpdate="0"/>
+        <default expression="" field="captain_phone" applyOnUpdate="0"/>
+        <default expression="" field="captain_email" applyOnUpdate="0"/>
+        <default expression="" field="days" applyOnUpdate="0"/>
+        <default expression="" field="races" applyOnUpdate="0"/>
+        <default expression="" field="first_runner" applyOnUpdate="0"/>
+        <default expression="" field="last_runner" applyOnUpdate="0"/>
+        <default expression="" field="instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="position" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="club" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="firstname" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="surname" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="phone" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="email" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="captain" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="captain_phone" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="captain_email" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="days" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="races" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="first_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="last_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="instructions" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="club" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="firstname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="surname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="phone" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="email" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="captain" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="captain_phone" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="captain_email" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="days" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="races" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="first_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="last_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="instructions" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="position" desc="" exp=""/>
@@ -14054,23 +16456,23 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="position" type="field" width="-1"/>
-          <column hidden="0" name="name" type="field" width="221"/>
-          <column hidden="0" name="club" type="field" width="-1"/>
-          <column hidden="0" name="phone" type="field" width="-1"/>
-          <column hidden="0" name="email" type="field" width="-1"/>
-          <column hidden="0" name="captain" type="field" width="-1"/>
-          <column hidden="0" name="races" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="first_runner" type="field" width="-1"/>
-          <column hidden="0" name="last_runner" type="field" width="-1"/>
-          <column hidden="0" name="instructions" type="field" width="-1"/>
-          <column hidden="0" name="firstname" type="field" width="-1"/>
-          <column hidden="0" name="surname" type="field" width="-1"/>
-          <column hidden="0" name="captain_phone" type="field" width="-1"/>
-          <column hidden="0" name="captain_email" type="field" width="-1"/>
+          <column type="field" name="position" width="-1" hidden="0"/>
+          <column type="field" name="name" width="221" hidden="0"/>
+          <column type="field" name="club" width="-1" hidden="0"/>
+          <column type="field" name="phone" width="-1" hidden="0"/>
+          <column type="field" name="email" width="-1" hidden="0"/>
+          <column type="field" name="captain" width="-1" hidden="0"/>
+          <column type="field" name="races" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="first_runner" width="-1" hidden="0"/>
+          <column type="field" name="last_runner" width="-1" hidden="0"/>
+          <column type="field" name="instructions" width="-1" hidden="0"/>
+          <column type="field" name="firstname" width="-1" hidden="0"/>
+          <column type="field" name="surname" width="-1" hidden="0"/>
+          <column type="field" name="captain_phone" width="-1" hidden="0"/>
+          <column type="field" name="captain_email" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14102,23 +16504,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="10_distance"/>
@@ -14145,7 +16547,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -14210,7 +16612,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14235,58 +16637,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="141,90,153,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="141,90,153,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14317,36 +16719,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="141,90,153,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="101,64,109,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="141,90,153,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="101,64,109,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -14361,44 +16763,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="141,90,153,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="101,64,109,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="141,90,153,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="101,64,109,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14421,58 +16823,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car"/>
-          <rule symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="123,211,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14503,50 +16905,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" 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="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="4;1;1;1"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1.25"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -14577,30 +16979,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -14620,33 +17022,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="5"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -14662,32 +17064,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="miter"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -14702,9 +17104,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -14717,60 +17119,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -14801,9 +17203,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14811,20 +17213,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -14843,16 +17245,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -14862,11 +17264,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14898,8 +17300,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -14911,7 +17313,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14976,7 +17378,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15001,58 +17403,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="232,113,141,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="232,113,141,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -15083,36 +17485,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="232,113,141,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="166,81,101,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="232,113,141,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="166,81,101,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -15127,44 +17529,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="232,113,141,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="166,81,101,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="232,113,141,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="166,81,101,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15187,44 +17589,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="name" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="8.5" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.75" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="name" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="8.5" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.75" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1.5" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferJoinStyle="64"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -15239,158 +17641,158 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                <Option type="QString" name="name" value=""/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="LabelRotation">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
-                  <Option name="PositionX" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_x" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                  <Option type="Map" name="PositionX">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="field" value="label_x"/>
+                    <Option type="int" name="type" value="2"/>
                   </Option>
-                  <Option name="PositionY" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_y" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                  <Option type="Map" name="PositionY">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="field" value="label_y"/>
+                    <Option type="int" name="type" value="2"/>
                   </Option>
-                  <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                  <Option type="Map" name="Size">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-20" priority="1" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="2" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="0.20000000000000001" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="1" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="0.20000000000000001" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_x"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_y"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="&quot;name&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="&quot;name&quot;"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -15421,9 +17823,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15431,28 +17833,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15461,8 +17863,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15471,8 +17873,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15481,8 +17883,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15491,8 +17893,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15501,8 +17903,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15511,8 +17913,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15521,8 +17923,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15531,45 +17933,45 @@ 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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" 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 field="id" name="" index="0"/>
+        <alias field="osm_id" name="" index="1"/>
+        <alias field="name" name="" index="2"/>
+        <alias field="type" name="" index="3"/>
+        <alias field="z_order" name="" index="4"/>
+        <alias field="population" name="" index="5"/>
+        <alias field="label_x" name="" index="6"/>
+        <alias field="label_y" name="" index="7"/>
+        <alias field="label_rota" name="" index="8"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="osm_id" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="z_order" expression=""/>
-        <default applyOnUpdate="0" field="population" expression=""/>
-        <default applyOnUpdate="0" field="label_x" expression=""/>
-        <default applyOnUpdate="0" field="label_y" expression=""/>
-        <default applyOnUpdate="0" field="label_rota" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="osm_id" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="z_order" applyOnUpdate="0"/>
+        <default expression="" field="population" applyOnUpdate="0"/>
+        <default expression="" field="label_x" applyOnUpdate="0"/>
+        <default expression="" field="label_y" applyOnUpdate="0"/>
+        <default expression="" field="label_rota" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="osm_id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="z_order" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="population" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_rota" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="osm_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="z_order" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="population" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_x" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_y" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_rota" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -15586,18 +17988,18 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="osm_id" type="field" width="-1"/>
-          <column hidden="0" name="name" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="z_order" type="field" width="-1"/>
-          <column hidden="0" name="population" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="label_x" type="field" width="-1"/>
-          <column hidden="0" name="label_y" type="field" width="-1"/>
-          <column hidden="0" name="label_rota" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="osm_id" width="-1" hidden="0"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="z_order" width="-1" hidden="0"/>
+          <column type="field" name="population" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="label_x" width="-1" hidden="0"/>
+          <column type="field" name="label_y" width="-1" hidden="0"/>
+          <column type="field" name="label_rota" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15629,15 +18031,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -15656,7 +18058,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -15721,7 +18123,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15746,58 +18148,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="255,158,23,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="255,158,23,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -15828,36 +18230,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,158,23,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="182,113,16,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,158,23,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="182,113,16,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -15872,44 +18274,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,158,23,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="182,113,16,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="255,158,23,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="182,113,16,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15932,52 +18334,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="7" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.80000000000000004" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="7" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.80000000000000004" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="196,60,57,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="196,60,57,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -16000,34 +18402,34 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -16042,165 +18444,165 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-20" priority="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="3" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MapUnit" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="4" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="LineGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="0.29999999999999999" minFeatureSize="5" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="1" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MapUnit" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="LineGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="3" priority="3" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="5" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="0.29999999999999999" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="always_sho" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="AlwaysShow">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="always_sho"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="IsObstacle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="&quot;&quot;" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="IsObstacle">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="&quot;&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="LabelRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_x"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_y"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Priority" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                <Option type="Map" name="Priority">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="Show" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="auxiliary_storage_labeling_show" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="Show">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="auxiliary_storage_labeling_show"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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="dualview/previewExpressions" type="List">
-            <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <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" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -16231,9 +18633,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16241,28 +18643,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -16271,8 +18673,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -16316,8 +18718,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -16380,58 +18782,58 @@ 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 field="osm_id" name="" index="0"/>
+        <alias field="name" name="" index="1"/>
+        <alias field="highway" name="" index="2"/>
+        <alias field="waterway" name="" index="3"/>
+        <alias field="aerialway" name="" index="4"/>
+        <alias field="barrier" name="" index="5"/>
+        <alias field="man_made" name="" index="6"/>
+        <alias field="z_order" name="" index="7"/>
+        <alias field="other_tags" name="" index="8"/>
+        <alias field="never_show" name="" index="9"/>
+        <alias field="label_x" name="" index="10"/>
+        <alias field="label_y" name="" index="11"/>
+        <alias field="label_rota" name="" index="12"/>
+        <alias field="always_sho" name="" index="13"/>
+        <alias field="resident_a" name="" index="14"/>
+        <alias field="auxiliary_storage_labeling_show" name="" index="15"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="osm_id" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="highway" expression=""/>
-        <default applyOnUpdate="0" field="waterway" expression=""/>
-        <default applyOnUpdate="0" field="aerialway" expression=""/>
-        <default applyOnUpdate="0" field="barrier" expression=""/>
-        <default applyOnUpdate="0" field="man_made" expression=""/>
-        <default applyOnUpdate="0" field="z_order" expression=""/>
-        <default applyOnUpdate="0" field="other_tags" expression=""/>
-        <default applyOnUpdate="0" field="never_show" expression=""/>
-        <default applyOnUpdate="0" field="label_x" expression=""/>
-        <default applyOnUpdate="0" field="label_y" expression=""/>
-        <default applyOnUpdate="0" field="label_rota" expression=""/>
-        <default applyOnUpdate="0" field="always_sho" expression=""/>
-        <default applyOnUpdate="0" field="resident_a" expression=""/>
-        <default applyOnUpdate="0" field="auxiliary_storage_labeling_show" expression=""/>
+        <default expression="" field="osm_id" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="highway" applyOnUpdate="0"/>
+        <default expression="" field="waterway" applyOnUpdate="0"/>
+        <default expression="" field="aerialway" applyOnUpdate="0"/>
+        <default expression="" field="barrier" applyOnUpdate="0"/>
+        <default expression="" field="man_made" applyOnUpdate="0"/>
+        <default expression="" field="z_order" applyOnUpdate="0"/>
+        <default expression="" field="other_tags" applyOnUpdate="0"/>
+        <default expression="" field="never_show" applyOnUpdate="0"/>
+        <default expression="" field="label_x" applyOnUpdate="0"/>
+        <default expression="" field="label_y" applyOnUpdate="0"/>
+        <default expression="" field="label_rota" applyOnUpdate="0"/>
+        <default expression="" field="always_sho" applyOnUpdate="0"/>
+        <default expression="" field="resident_a" applyOnUpdate="0"/>
+        <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="osm_id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="highway" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="waterway" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="aerialway" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="barrier" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="man_made" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="z_order" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="other_tags" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="never_show" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_rota" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="always_sho" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="resident_a" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="auxiliary_storage_labeling_show" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="osm_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="highway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="waterway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="aerialway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="barrier" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="man_made" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="z_order" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="other_tags" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="never_show" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_x" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_y" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_rota" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="always_sho" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="resident_a" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="osm_id" desc="" exp=""/>
@@ -16455,25 +18857,25 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column hidden="0" name="osm_id" type="field" width="-1"/>
-          <column hidden="0" name="name" type="field" width="160"/>
-          <column hidden="0" name="z_order" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="highway" type="field" width="-1"/>
-          <column hidden="0" name="waterway" type="field" width="-1"/>
-          <column hidden="0" name="aerialway" type="field" width="-1"/>
-          <column hidden="0" name="barrier" type="field" width="-1"/>
-          <column hidden="0" name="man_made" type="field" width="-1"/>
-          <column hidden="0" name="other_tags" type="field" width="142"/>
-          <column hidden="0" name="never_show" type="field" width="-1"/>
-          <column hidden="0" name="label_x" type="field" width="-1"/>
-          <column hidden="0" name="label_y" type="field" width="-1"/>
-          <column hidden="0" name="label_rota" type="field" width="-1"/>
-          <column hidden="0" name="always_sho" type="field" width="-1"/>
-          <column hidden="0" name="resident_a" type="field" width="-1"/>
-          <column hidden="0" name="auxiliary_storage_labeling_show" type="field" width="-1"/>
+          <column type="field" name="osm_id" width="-1" hidden="0"/>
+          <column type="field" name="name" width="160" hidden="0"/>
+          <column type="field" name="z_order" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="highway" width="-1" hidden="0"/>
+          <column type="field" name="waterway" width="-1" hidden="0"/>
+          <column type="field" name="aerialway" width="-1" hidden="0"/>
+          <column type="field" name="barrier" width="-1" hidden="0"/>
+          <column type="field" name="man_made" width="-1" hidden="0"/>
+          <column type="field" name="other_tags" width="142" hidden="0"/>
+          <column type="field" name="never_show" width="-1" hidden="0"/>
+          <column type="field" name="label_x" width="-1" hidden="0"/>
+          <column type="field" name="label_y" width="-1" hidden="0"/>
+          <column type="field" name="label_rota" width="-1" hidden="0"/>
+          <column type="field" name="always_sho" width="-1" hidden="0"/>
+          <column type="field" name="resident_a" width="-1" hidden="0"/>
+          <column type="field" name="auxiliary_storage_labeling_show" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16505,40 +18907,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="aerialway"/>
@@ -16577,22 +18979,22 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="z_order"/>
       </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>
@@ -16642,7 +19044,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -16707,7 +19109,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16732,58 +19134,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="231,113,72,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="231,113,72,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16814,36 +19216,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="231,113,72,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="165,81,51,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="231,113,72,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="165,81,51,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -16858,44 +19260,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="231,113,72,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="165,81,51,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="231,113,72,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="165,81,51,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16918,54 +19320,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
-          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
-          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
-          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
-          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
-          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
+          <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}"/>
+          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="star" 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="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.5" 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="7" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="name" value="star"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.5"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="7"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16988,47 +19390,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,32,80,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="amenity/amenity_toilets.svg" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="0,32,80,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="amenity/amenity_toilets.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="7"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -17050,47 +19452,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/gym-bag.svg" 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="0,0,0,255" name="outline_color" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="../images/gym-bag.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="6"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -17112,57 +19514,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="fillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/road_closure.svg" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="../images/road_closure.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="6"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -17184,47 +19586,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="4" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,12,254,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/transport_bus_stop.svg" 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="255,255,255,255" name="outline_color" type="QString"/>
-                <Option value="0" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="0,12,254,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="transport/transport_bus_stop.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="255,255,255,255"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="5"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -17244,21 +19646,21 @@ def my_form_open(dialog, layer, feature):
               <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="size_unit" v="MM"/>
               <prop k="vertical_anchor_point" v="1"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="13"/>
+                    <Option type="QString" name="blur_level" value="2.645"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="offset_angle" value="135"/>
+                    <Option type="QString" name="offset_distance" value="2"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -17275,24 +19677,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="0"/>
+                    <Option type="QString" name="blur_level" value="0.7935"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color1" value="0,0,255,255"/>
+                    <Option type="QString" name="color2" value="0,255,0,255"/>
+                    <Option type="QString" name="color_type" value="0"/>
+                    <Option type="QString" name="direction" value="ccw"/>
+                    <Option type="QString" name="discrete" value="0"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="1"/>
+                    <Option type="QString" name="opacity" value="0.5"/>
+                    <Option type="QString" name="rampType" value="gradient"/>
+                    <Option type="QString" name="single_color" value="255,255,255,255"/>
+                    <Option type="QString" name="spec" value="rgb"/>
+                    <Option type="QString" name="spread" value="2"/>
+                    <Option type="QString" name="spread_unit" value="MM"/>
+                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -17315,10 +19717,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="0"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="1"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -17327,18 +19729,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="13"/>
+                    <Option type="QString" name="blur_level" value="2.645"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="offset_angle" value="135"/>
+                    <Option type="QString" name="offset_distance" value="2"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -17355,24 +19757,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="0"/>
+                    <Option type="QString" name="blur_level" value="0.7935"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color1" value="0,0,255,255"/>
+                    <Option type="QString" name="color2" value="0,255,0,255"/>
+                    <Option type="QString" name="color_type" value="0"/>
+                    <Option type="QString" name="direction" value="ccw"/>
+                    <Option type="QString" name="discrete" value="0"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="opacity" value="0.5"/>
+                    <Option type="QString" name="rampType" value="gradient"/>
+                    <Option type="QString" name="single_color" value="255,255,255,255"/>
+                    <Option type="QString" name="spec" value="rgb"/>
+                    <Option type="QString" name="spread" value="2"/>
+                    <Option type="QString" name="spread_unit" value="MM"/>
+                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -17396,47 +19798,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="5" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="43,153,41,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/amenity=parking.svg" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="43,153,41,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="transport/amenity=parking.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="6"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -17458,15 +19860,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17475,32 +19877,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="name" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="name" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="2" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.80000000000000004" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="2" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.69999999999999996" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="2" shapeRadiiY="2" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="0.69999999999999996" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -17515,148 +19917,148 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelDistance" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                <Option type="QString" name="name" value=""/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="LabelDistance">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
-                  <Option name="OffsetQuad" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="2" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                  <Option type="Map" name="OffsetQuad">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="2"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
-                  <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                  <Option type="Map" name="Size">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-25" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="2" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="2" dist="3" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1.8" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="10"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="2" geometryGenerator="" lineAnchorType="0" xOffset="2" dist="3" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="3" offsetUnits="MM" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="10" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelDistance" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelDistance">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="OffsetQuad" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="2" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="OffsetQuad">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="2"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17687,9 +20089,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17697,20 +20099,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -17743,22 +20145,22 @@ 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 field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="name" name="" index="2"/>
+        <alias field="distance" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -17770,13 +20172,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="name" type="field" width="-1"/>
-          <column hidden="0" name="distance" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17808,10 +20210,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="distance"/>
@@ -17825,7 +20227,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiPolygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -17898,58 +20300,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="152,125,183,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="152,125,183,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17980,36 +20382,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,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="109,89,131,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="152,125,183,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="109,89,131,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -18024,44 +20426,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="152,125,183,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="109,89,131,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="152,125,183,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="109,89,131,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18084,42 +20486,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" locked="0" enabled="1" pass="0">
+            <layer class="LinePatternFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="135" name="angle" type="QString"/>
-                <Option value="during_render" name="clip_mode" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="feature" name="coordinate_reference" type="QString"/>
-                <Option value="2" name="distance" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="distance_map_unit_scale" type="QString"/>
-                <Option value="MM" name="distance_unit" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale" 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="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 type="QString" name="angle" value="135"/>
+                <Option type="QString" name="clip_mode" value="during_render"/>
+                <Option type="QString" name="color" value="211,134,33,255"/>
+                <Option type="QString" name="coordinate_reference" value="feature"/>
+                <Option type="QString" name="distance" value="2"/>
+                <Option type="QString" name="distance_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="distance_unit" value="MM"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
               </Option>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -18138,48 +20540,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+              <symbol type="line" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                   <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="211,134,33,255" name="line_color" type="QString"/>
-                    <Option value="solid" name="line_style" type="QString"/>
-                    <Option value="0.3" 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 type="QString" name="align_dash_pattern" value="0"/>
+                    <Option type="QString" name="capstyle" value="square"/>
+                    <Option type="QString" name="customdash" value="5;2"/>
+                    <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="customdash_unit" value="MM"/>
+                    <Option type="QString" name="dash_pattern_offset" value="0"/>
+                    <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                    <Option type="QString" name="draw_inside_polygon" value="0"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="line_color" value="211,134,33,255"/>
+                    <Option type="QString" name="line_style" value="solid"/>
+                    <Option type="QString" name="line_width" value="0.3"/>
+                    <Option type="QString" name="line_width_unit" value="MM"/>
+                    <Option type="QString" name="offset" value="0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="ring_filter" value="0"/>
+                    <Option type="QString" name="trim_distance_end" value="0"/>
+                    <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                    <Option type="QString" name="trim_distance_start" value="0"/>
+                    <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                    <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                    <Option type="QString" name="use_custom_dash" value="0"/>
+                    <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -18210,27 +20612,27 @@ def my_form_open(dialog, layer, feature):
                   <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="211,134,33,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="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.46" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="no" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="211,134,33,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.46"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="no"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -18245,9 +20647,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18258,60 +20660,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18342,9 +20744,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18352,20 +20754,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="1" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="FID" configurationFlags="None">
@@ -18377,13 +20779,13 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias field="FID" name="" index="0"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="FID" expression=""/>
+        <default expression="" field="FID" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="FID" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="FID" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="FID" desc="" exp=""/>
@@ -18392,11 +20794,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="431"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="431" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18428,8 +20830,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -18441,7 +20843,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -18506,7 +20908,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18531,58 +20933,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="190,207,80,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="190,207,80,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18613,36 +21015,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,207,80,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="136,148,57,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="190,207,80,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,148,57,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -18657,44 +21059,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,207,80,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="136,148,57,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="190,207,80,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,148,57,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18717,61 +21119,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'" label="Road Open"/>
-          <rule symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'" label="No Parking"/>
-          <rule symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed"/>
-          <rule symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'" label="One-Way"/>
-          <rule symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'" label="Road Closures"/>
+          <rule symbol="0" label="Road Open" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule symbol="1" label="No Parking" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule symbol="2" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule symbol="3" label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule symbol="4" label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,255,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18802,50 +21204,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="2" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="2"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -18865,40 +21267,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,255,0,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" 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="1" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,255,0,255"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0.5"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="1"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18921,52 +21323,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="2;1;1;1" 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="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash dot dot" name="line_style" type="QString"/>
-                <Option value="0.75" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="2;1;1;1"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,255,0,255"/>
+                <Option type="QString" name="line_style" value="dash dot dot"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18997,41 +21399,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="25"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -19051,46 +21453,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" 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="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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.5" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,255,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3.5"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -19113,58 +21515,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="outlineStyle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="3" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="3;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="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="0.75" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="3;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,255,0,255"/>
+                <Option type="QString" name="line_style" value="dash"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19195,41 +21597,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="25"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -19249,46 +21651,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@3@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@3@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" 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="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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.5" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,255,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3.5"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -19311,58 +21713,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="outlineStyle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="4" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="255,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="255,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19393,20 +21795,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19415,32 +21817,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="times" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="9" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="times" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="9" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -19455,116 +21857,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="2" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -19595,9 +21997,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19605,20 +22007,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -19651,22 +22053,22 @@ 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 field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="status" name="" index="2"/>
+        <alias field="times" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="status" expression=""/>
-        <default applyOnUpdate="0" field="times" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="status" applyOnUpdate="0"/>
+        <default expression="" field="times" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="times" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="status" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="times" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -19678,13 +22080,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="202"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="status" type="field" width="-1"/>
-          <column hidden="0" name="times" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="202" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="status" width="-1" hidden="0"/>
+          <column type="field" name="times" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19716,10 +22118,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -19733,21 +22135,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
-        <xmin>18.37543911768802474</xmin>
+        <xmin>18.37571523317913247</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.90013265894425842</ymax>
+        <ymax>-33.89978292253275782</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37543911768802474</xmin>
+        <xmin>18.37571523317913247</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.90013265894425842</ymax>
+        <ymax>-33.89978292253275782</ymax>
       </wgs84extent>
-      <id>route_markers_6943d827_bf32_40af_988d_60a736c1d3e1</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=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(4,0)&amp;field=day:integer(2,0)</datasource>
+      <id>route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1</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>
@@ -19772,15 +22174,6 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -19797,15 +22190,7 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
+        <extent/>
       </resourceMetadata>
       <provider encoding="">memory</provider>
       <vectorjoins/>
@@ -19823,58 +22208,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="225,89,137,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="225,89,137,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19905,36 +22290,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,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="161,64,98,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="161,64,98,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -19949,44 +22334,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="225,89,137,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="161,64,98,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="161,64,98,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20009,54 +22394,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{cde085cc-58f2-4c49-a2cc-2614d5832170}">
-          <rule key="{95db1799-9de4-4074-994e-29c2f4e9f52f}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes" key="{95db1799-9de4-4074-994e-29c2f4e9f52f}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -20079,34 +22464,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" 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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -20121,138 +22506,138 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="3" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="PointGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{379f64c2-b5f6-4f7d-a33c-c6a10b65e7ef}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" 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="{379f64c2-b5f6-4f7d-a33c-c6a10b65e7ef}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -20275,34 +22660,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" 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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -20317,131 +22702,131 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="3" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="PointGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{72924649-3eef-4d1a-8529-de69270205d9}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends">
-            <rule key="{e7facde6-7dab-47b6-82a7-d1c25c9249a4}" active="0" filter="&quot;Source&quot; = '21KM'" 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="{72924649-3eef-4d1a-8529-de69270205d9}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{e7facde6-7dab-47b6-82a7-d1c25c9249a4}">
               <settings calloutType="simple">
-                <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                  <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeFillColor="210,32,39,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                    <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="210,32,39,255" name="color" type="QString"/>
-                          <Option value="round" 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="210,32,39,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="210,32,39,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -20456,130 +22841,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-                <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="3" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-                <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}" active="0" filter="&quot;Source&quot; = '10KM'" description="10KM">
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
               <settings calloutType="simple">
-                <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                  <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeFillColor="103,34,144,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                    <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="103,34,144,255" name="color" type="QString"/>
-                          <Option value="round" 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="103,34,144,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="103,34,144,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -20594,130 +22979,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-                <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-                <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}" active="0" filter="&quot;Source&quot; = '5KM'" description="5KM">
+            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
               <settings calloutType="simple">
-                <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                  <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                    <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="145,211,55,255" name="color" type="QString"/>
-                          <Option value="round" 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="145,211,55,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="145,211,55,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -20732,138 +23117,138 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-                <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-                <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}" active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail">
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
               <settings calloutType="simple">
-                <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                  <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                    <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="0" name="angle" type="QString"/>
-                          <Option value="square" name="cap_style" type="QString"/>
-                          <Option value="133,182,111,255" name="color" type="QString"/>
-                          <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                          <Option value="bevel" name="joinstyle" type="QString"/>
-                          <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                          <Option type="QString" name="cap_style" value="square"/>
+                          <Option type="QString" name="color" value="133,182,111,255"/>
+                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                          <Option type="QString" name="joinstyle" value="bevel"/>
+                          <Option type="QString" name="name" value="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
                         </Option>
                         <prop k="angle" v="0"/>
                         <prop k="cap_style" v="square"/>
@@ -20886,34 +23271,34 @@ def my_form_open(dialog, layer, feature):
                         <prop k="vertical_anchor_point" v="1"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="0,72,255,255" name="color" type="QString"/>
-                          <Option value="round" 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="0,72,255,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="0,72,255,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="0,72,255,255"/>
@@ -20928,77 +23313,77 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-                <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="PointGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-                <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -21008,62 +23393,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21094,9 +23479,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21104,28 +23489,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21134,8 +23519,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21144,8 +23529,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21154,8 +23539,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21164,8 +23549,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21174,8 +23559,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21184,8 +23569,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21194,8 +23579,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21207,53 +23592,6 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="quadrant" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
         <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
@@ -21261,57 +23599,104 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="length_km" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_m" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="org_fid" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </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="length_m" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="org_fid" index="11" name=""/>
-        <alias field="distance" index="12" name=""/>
-        <alias field="quadrant" index="13" name=""/>
-        <alias field="day" index="14" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_km" name="" index="10"/>
+        <alias field="length_m" name="" index="11"/>
+        <alias field="org_fid" name="" index="12"/>
+        <alias field="distance" name="" index="13"/>
+        <alias field="quadrant" name="" index="14"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="Sort" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="org_fid" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
-        <default applyOnUpdate="0" field="quadrant" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <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" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="descriptio" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="timestamp" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="begin" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="end" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Distance" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="RouteLen" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Source" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Sort" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_m" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_km" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="org_fid" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="quadrant" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="quadrant" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" desc="" exp=""/>
@@ -21323,35 +23708,35 @@ def my_form_open(dialog, layer, feature):
         <constraint field="RouteLen" desc="" exp=""/>
         <constraint field="Source" desc="" exp=""/>
         <constraint field="Sort" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
         <constraint field="length_km" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
         <constraint field="org_fid" desc="" exp=""/>
         <constraint field="distance" desc="" exp=""/>
         <constraint field="quadrant" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="org_fid" type="field" width="-1"/>
-          <column hidden="0" name="distance" type="field" width="-1"/>
-          <column hidden="0" name="Name" type="field" width="-1"/>
-          <column hidden="0" name="Source" type="field" width="-1"/>
-          <column hidden="0" name="RouteLen" type="field" width="-1"/>
-          <column hidden="0" name="descriptio" type="field" width="-1"/>
-          <column hidden="0" name="timestamp" type="field" width="-1"/>
-          <column hidden="0" name="begin" type="field" width="-1"/>
-          <column hidden="0" name="end" type="field" width="-1"/>
-          <column hidden="0" name="Distance" type="field" width="-1"/>
-          <column hidden="0" name="length_km" type="field" width="-1"/>
-          <column hidden="0" name="Sort" type="field" width="-1"/>
-          <column hidden="0" name="quadrant" type="field" width="-1"/>
-          <column hidden="0" name="day" type="field" width="-1"/>
-          <column hidden="0" name="length_m" type="field" width="-1"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="-1" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="Sort" width="-1" hidden="0"/>
+          <column type="field" name="quadrant" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21383,21 +23768,21 @@ def my_form_open(dialog, layer, feature):
       <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"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -21417,28 +23802,1716 @@ def my_form_open(dialog, layer, feature):
         <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"/>
+        <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>Text</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiPolygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+      <extent>
+        <xmin>18.37543911768802474</xmin>
+        <ymin>-33.95582126985814853</ymin>
+        <xmax>18.42275999405387665</xmax>
+        <ymax>-33.90013265894425842</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37543911768802474</xmin>
+        <ymin>-33.95582126985814853</ymin>
+        <xmax>18.42275999405387665</xmax>
+        <ymax>-33.90013265894425842</ymax>
+      </wgs84extent>
+      <id>route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7</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_m:integer(6,0)&amp;field=length_km: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/>
+        <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 limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+        <data-defined-properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data-defined-properties>
+        <profileLineSymbol>
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="225,89,137,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="225,89,137,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.6"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileLineSymbol>
+        <profileFillSymbol>
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="161,64,98,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="225,89,137,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="161,64,98,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileFillSymbol>
+        <profileMarkerSymbol>
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="161,64,98,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
+              </Option>
+              <prop k="angle" v="0"/>
+              <prop k="cap_style" v="square"/>
+              <prop k="color" v="225,89,137,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="diamond"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="161,64,98,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="3"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileMarkerSymbol>
+      </elevation>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <labeling type="rule-based">
+        <rules key="{cde085cc-58f2-4c49-a2cc-2614d5832170}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes" key="{95db1799-9de4-4074-994e-29c2f4e9f52f}">
+            <settings calloutType="simple">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <families/>
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="213,180,60,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="joinstyle" v="round"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="0,0,0,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="1"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
+                    </Option>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
+                    </Option>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </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="{379f64c2-b5f6-4f7d-a33c-c6a10b65e7ef}">
+            <settings calloutType="simple">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <families/>
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="213,180,60,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="joinstyle" v="round"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="0,0,0,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="1"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
+                    </Option>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
+                    </Option>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </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="{72924649-3eef-4d1a-8529-de69270205d9}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{e7facde6-7dab-47b6-82a7-d1c25c9249a4}">
+              <settings calloutType="simple">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                  <families/>
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="210,32,39,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
+                        </Option>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="210,32,39,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="210,32,39,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
+              <settings calloutType="simple">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                  <families/>
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="103,34,144,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
+                        </Option>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="103,34,144,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="103,34,144,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
+              <settings calloutType="simple">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                  <families/>
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="145,211,55,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
+                        </Option>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="145,211,55,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="145,211,55,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
+              <settings calloutType="simple">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                  <families/>
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="angle" value="0"/>
+                          <Option type="QString" name="cap_style" value="square"/>
+                          <Option type="QString" name="color" value="133,182,111,255"/>
+                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                          <Option type="QString" name="joinstyle" value="bevel"/>
+                          <Option type="QString" name="name" value="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        </Option>
+                        <prop k="angle" v="0"/>
+                        <prop k="cap_style" v="square"/>
+                        <prop k="color" v="133,182,111,255"/>
+                        <prop k="horizontal_anchor_point" v="1"/>
+                        <prop k="joinstyle" v="bevel"/>
+                        <prop k="name" v="circle"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="35,35,35,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="0"/>
+                        <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="scale_method" v="diameter"/>
+                        <prop k="size" v="2"/>
+                        <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="size_unit" v="MM"/>
+                        <prop k="vertical_anchor_point" v="1"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="0,72,255,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
+                        </Option>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="0,72,255,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="0,72,255,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+          </rule>
+        </rules>
+      </labeling>
+      <customproperties>
+        <Option type="Map">
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+          </Option>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+          <axisSymbol>
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+                <Option type="Map">
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                </Option>
+                <prop k="align_dash_pattern" v="0"/>
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="dash_pattern_offset" v="0"/>
+                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="dash_pattern_offset_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="35,35,35,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0.26"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="trim_distance_end" v="0"/>
+                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="trim_distance_end_unit" v="MM"/>
+                <prop k="trim_distance_start" v="0"/>
+                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="trim_distance_start_unit" v="MM"/>
+                <prop k="tweak_dash_pattern_on_corners" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+        <properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="descriptio" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="timestamp" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="begin" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="end" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="RouteLen" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Source" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" 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="length_m" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_km" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="org_fid" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="quadrant" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_m" name="" index="10"/>
+        <alias field="length_km" name="" index="11"/>
+        <alias field="org_fid" name="" index="12"/>
+        <alias field="distance" name="" index="13"/>
+        <alias field="quadrant" name="" index="14"/>
+      </aliases>
+      <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_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="quadrant" applyOnUpdate="0"/>
+      </defaults>
+      <constraints>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="quadrant" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="quadrant" desc="" exp=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
+        <columns>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="-1" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="Sort" width="-1" hidden="0"/>
+          <column type="field" name="quadrant" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+        </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 name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
+      </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 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>Text</mapTip>
+    </maplayer>
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -21511,58 +25584,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="229,182,54,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="229,182,54,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21593,36 +25666,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,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="164,130,39,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="164,130,39,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -21637,44 +25710,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,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="164,130,39,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="164,130,39,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21697,38 +25770,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="114,155,111,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -21743,9 +25816,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21756,22 +25829,22 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -21797,19 +25870,19 @@ 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 field="id" name="" index="0"/>
+        <alias field="area" name="" index="1"/>
+        <alias field="rotation" name="" index="2"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="area" expression=""/>
-        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="area" applyOnUpdate="0"/>
+        <default expression="" field="rotation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="area" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="area" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="rotation" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -21820,12 +25893,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="area" type="field" width="-1"/>
-          <column hidden="0" name="rotation" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="area" width="-1" hidden="0"/>
+          <column type="field" name="rotation" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21848,7 +25921,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -21913,7 +25986,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21938,58 +26011,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="196,60,57,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="196,60,57,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22020,36 +26093,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,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="140,43,41,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="196,60,57,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="140,43,41,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -22064,44 +26137,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,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="140,43,41,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="196,60,57,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="140,43,41,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22124,49 +26197,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0" label="All distances"/>
+          <rule symbol="0" label="All distances" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="1" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="35,35,35,0" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0" 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="0.5" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,0"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="0.5"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22189,20 +26262,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="fillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22214,64 +26287,64 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="dualview/previewExpressions" type="StringList">
-            <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="StringList" name="dualview/previewExpressions">
+            <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" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -22302,9 +26375,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22312,20 +26385,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
@@ -22353,8 +26426,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22370,8 +26443,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22380,8 +26453,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22430,49 +26503,49 @@ 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 field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="RouteLen" name="" index="5"/>
+        <alias field="Source" name="" index="6"/>
+        <alias field="length_m" name="" index="7"/>
+        <alias field="length_km" name="" index="8"/>
+        <alias field="org_fid" name="" index="9"/>
+        <alias field="distance" name="" index="10"/>
+        <alias field="first_runn" name="" index="11"/>
+        <alias field="last_runne" name="" index="12"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="org_fid" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
-        <default applyOnUpdate="0" field="first_runn" expression=""/>
-        <default applyOnUpdate="0" field="last_runne" expression=""/>
+        <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="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="first_runn" applyOnUpdate="0"/>
+        <default expression="" field="last_runne" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="descriptio" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="timestamp" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="begin" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="end" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="RouteLen" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Source" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_m" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_km" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="org_fid" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="first_runn" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="last_runne" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="first_runn" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="last_runne" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" desc="" exp=""/>
@@ -22493,22 +26566,22 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column hidden="0" name="begin" type="field" width="179"/>
-          <column hidden="0" name="RouteLen" type="field" width="-1"/>
-          <column hidden="0" name="Source" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="Name" type="field" width="-1"/>
-          <column hidden="0" name="length_m" type="field" width="-1"/>
-          <column hidden="0" name="length_km" type="field" width="-1"/>
-          <column hidden="0" name="org_fid" type="field" width="-1"/>
-          <column hidden="0" name="first_runn" type="field" width="-1"/>
-          <column hidden="0" name="last_runne" type="field" width="-1"/>
-          <column hidden="0" name="descriptio" type="field" width="-1"/>
-          <column hidden="0" name="timestamp" type="field" width="-1"/>
-          <column hidden="0" name="end" type="field" width="-1"/>
-          <column hidden="0" name="distance" type="field" width="-1"/>
+          <column type="field" name="begin" width="179" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="first_runn" width="-1" hidden="0"/>
+          <column type="field" name="last_runne" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22540,31 +26613,31 @@ def my_form_open(dialog, layer, feature):
       <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="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runne"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runne" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -22599,7 +26672,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22672,58 +26745,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="190,178,151,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="190,178,151,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22754,36 +26827,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,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="136,127,108,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="190,178,151,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,127,108,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -22798,44 +26871,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,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="136,127,108,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="190,178,151,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,127,108,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22858,58 +26931,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car"/>
-          <rule symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="123,211,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22940,50 +27013,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" 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="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="4;1;1;1"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1.25"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -23014,30 +27087,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -23057,33 +27130,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="5"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -23099,32 +27172,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="miter"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -23139,9 +27212,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -23154,60 +27227,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23238,9 +27311,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23248,20 +27321,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -23280,16 +27353,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -23299,11 +27372,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23335,8 +27408,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -23348,7 +27421,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -23421,58 +27494,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="145,82,45,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="145,82,45,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23503,36 +27576,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,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="104,59,32,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="145,82,45,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="104,59,32,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -23547,44 +27620,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,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="104,59,32,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="145,82,45,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="104,59,32,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -23607,44 +27680,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="label" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="15" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="label" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="15" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -23659,115 +27732,115 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="0" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23798,9 +27871,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23808,20 +27881,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -23840,16 +27913,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="label" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="label" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="label" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -23859,11 +27932,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="label" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="label" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23895,8 +27968,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -23908,7 +27981,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiPolygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -23973,7 +28046,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23998,58 +28071,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="125,139,143,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="125,139,143,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -24080,36 +28153,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,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="89,99,102,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="89,99,102,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -24124,44 +28197,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,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="89,99,102,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="89,99,102,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24184,46 +28257,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="label" fontWeight="75" fontLetterSpacing="0" namedStyle="Bold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="31,120,180,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="8" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="31,120,180,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="label" fontFamily="Myriad Pro" namedStyle="Bold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="75" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="0.75" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.40000000000000002" bufferJoinStyle="128"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeFillColor="255,255,255,204" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.29999999999999999" shapeRadiiX="0.5" shapeOffsetY="-0.14999999999999999" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeSizeX="0.75" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.75" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeBorderWidth="0.75" shapeJoinStyle="128" shapeOffsetY="-0.14999999999999999" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeSizeType="0" shapeSizeY="0.29999999999999999" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,204" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,204" name="color" type="QString"/>
-                        <Option value="round" 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="31,120,206,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.75" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,204"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="31,120,206,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.75"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -24238,56 +28311,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="1" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="1" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="1" dist="0" centroidWhole="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="0.76000000000000001" minFeatureSize="0" obstacle="1" maxNumLabels="6" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="5"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="1" geometryGenerator="" lineAnchorType="0" xOffset="1" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="1" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="0.76000000000000001" maxNumLabels="6" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -24296,60 +28369,60 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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 value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24380,9 +28453,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24390,28 +28463,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -24420,8 +28493,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -24430,8 +28503,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -24445,22 +28518,22 @@ 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="id" name="" index="0"/>
+        <alias field="table_set" name="" index="1"/>
+        <alias field="label" name="" index="2"/>
+        <alias field="races" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="table_set" expression=""/>
-        <default applyOnUpdate="0" field="label" expression=""/>
-        <default applyOnUpdate="0" field="races" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="table_set" applyOnUpdate="0"/>
+        <default expression="" field="label" applyOnUpdate="0"/>
+        <default expression="" field="races" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="table_set" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="races" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="table_set" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="races" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -24472,13 +28545,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="table_set" type="field" width="-1"/>
-          <column hidden="0" name="label" type="field" width="-1"/>
-          <column hidden="0" name="races" type="field" width="130"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="table_set" width="-1" hidden="0"/>
+          <column type="field" name="label" width="-1" hidden="0"/>
+          <column type="field" name="races" width="130" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24510,10 +28583,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -24553,7 +28626,8 @@ def my_form_open(dialog, layer, feature):
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-    <layer id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
+    <layer id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
+    <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -24722,7 +28796,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal overview</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -24884,278 +28958,308 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" name="name" type="QString"/>
+      <Option type="QString" name="name" value=""/>
       <Option name="properties"/>
-      <Option value="collection" name="type" type="QString"/>
+      <Option type="QString" name="type" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer expanded="0" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
+    <visibility-preset name="Access Routes" has-expanded-info="1">
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="All Routes">
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+    <visibility-preset has-checked-group-info="1" name="All Routes" has-expanded-info="1">
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default" expanded="1"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+      </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 id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+      </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="Start and Finish pages"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default"/>
+    <visibility-preset name="Ask Me" has-expanded-info="1">
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+    <visibility-preset name="Fencing" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
       <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="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </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 expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - inset">
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+    <visibility-preset name="Marshal map - inset" has-expanded-info="1">
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <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 expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - main">
-      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+    <visibility-preset name="Marshal map - main" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
         <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal overview">
-      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+    <visibility-preset has-checked-group-info="1" name="Marshal overview" has-expanded-info="1">
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
       <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 expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <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="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </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 expanded="1" visible="1" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" style="default"/>
-      <expanded-legend-nodes id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="0" id="water_tables20170921142016467" style="default"/>
+      <layer id="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default"/>
+      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
       <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer expanded="1" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default"/>
+      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
       <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="0"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Marshals"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="OSM data"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <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="OSM data"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Proposed Routes">
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+    <visibility-preset name="Proposed Routes" has-expanded-info="1">
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <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 expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="Start and Finish pages"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
-      <layer expanded="1" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer expanded="1" visible="1" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" style="default"/>
-      <expanded-legend-nodes id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+    <visibility-preset has-checked-group-info="1" name="Routes" has-expanded-info="1">
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default" expanded="1"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <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="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </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 expanded="1" visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" visible="0" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="0" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{ead1c5b2-1bdf-46f1-9a2d-4cfa2c6acb18}"/>
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default"/>
+      <layer id="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
       <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
@@ -25163,39 +29267,39 @@ def my_form_open(dialog, layer, feature):
         <checked-group-node id="OSM data"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <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="OSM data"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+    <visibility-preset name="Start/Finish" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshal pages"/>
+        <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="Start and Finish pages"/>
-        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -25222,31 +29326,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout units="mm" worldFileMap="" printResolution="144" name="Routes">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -25261,49 +29365,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -25318,59 +29422,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="9.44946,191.611,mm" zValue="9" visibility="1" blendMode="0" marginY="1" labelText="[%&quot;Distance&quot;%]" size="14.1764,7.471,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.44946,191.611,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.44946,191.611,mm" htmlState="0" size="14.1764,7.471,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[%&quot;Distance&quot;%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25385,65 +29489,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="24.2445,191.81,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="RACE ROUTE" size="29.2025,7.272,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" positionLock="true" groupUuid="" excludeFromExports="0" position="24.2445,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="0" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="24.2445,191.81,mm" htmlState="0" size="29.2025,7.272,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="RACE ROUTE" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25458,65 +29562,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.0" size="57.4836,6.8714,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" positionLock="true" groupUuid="" excludeFromExports="0" position="204.225,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25531,65 +29635,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 September 2020" size="51.6706,6.60801,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" positionLock="true" groupUuid="" excludeFromExports="0" position="210.038,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 September 2020" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25604,39 +29708,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" zValue="4" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="17.3653" northMode="0" blendMode="0" pictureHeight="17.4718" pictureRotation="0" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northOffset="0" size="29.7523,17.4718,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" positionLock="true" groupUuid="" excludeFromExports="0" position="262.196,188.218,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25644,42 +29748,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" zValue="3" visibility="1" shapeType="1" blendMode="0" size="251.959,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -25694,61 +29798,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" zValue="2" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="67.7828,166.874,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="true" opacity="1" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Routes" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
+        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
         <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>
@@ -25763,45 +29867,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -25832,44 +29936,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -25892,40 +29996,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -25940,29 +30044,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25972,43 +30076,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,9.08557,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="282.012,174.44,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="round" id="" type="65639" frame="true" opacity="1" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm" drawCanvasItems="false" background="true" followPresetName="Routes" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.44946,9.08557,mm" size="282.012,174.44,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" xmax="18.42303517425787263" ymin="-33.92999999999999972" ymax="-33.89719473757251222"/>
+        <Extent xmin="18.37000000000000099" ymax="-33.89719473757251222" xmax="18.42303517425787263" ymin="-33.92999999999999972"/>
         <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>
@@ -26023,45 +30127,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26092,44 +30196,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26152,40 +30256,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26200,29 +30304,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26232,60 +30336,60 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="QString"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="QString"/>
-          <Option value="1" name="pdfSimplify" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfAppendGeoreference" value="1"/>
+          <Option type="QString" name="pdfCreateGeoPdf" value="0"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
+          <Option type="QString" name="pdfExportThemes" value=""/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfOgcBestPracticeFormat" value="0"/>
+          <Option type="QString" name="pdfSimplify" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" hideCoverage="0" sortAscending="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr" pageNameExpression="&quot;Distance&quot;" filterFeatures="1"/>
+      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" coverageLayerName="all_routes" coverageLayerProvider="ogr" filterFeatures="1" sortFeatures="1" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshals">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -26300,49 +30404,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -26357,9 +30461,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26367,15 +30471,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="110.353,5.04491,mm" size="39.4312,46.1,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.1,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="true" splitLayer="0" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" frameJoinStyle="bevel" wmsLegendWidth="50" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="5" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="110.353,5.04491,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="128" green="128" blue="128"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.1,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="110.353,5.04491,mm" blendMode="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="39.4312,46.1,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" zValue="5" rasterBorder="1" groupUuid="" position="110.353,5.04491,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="bevel" title="" background="true">
+        <FrameColor alpha="255" blue="128" green="128" red="128"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26383,48 +30487,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
           </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Unchecked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" name="fencing">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="0,1,2" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="legend/node-order" value="0,1,2"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -26432,62 +30536,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="98.7828,149.027,mm" zValue="4" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="56.5192,54.5647,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="true" opacity="1" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="98.7828,149.027,mm" outlineWidthM="0.2,mm" drawCanvasItems="false" background="true" followPresetName="Marshal map - inset" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="98.7828,149.027,mm" size="56.5192,54.5647,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal map - inset" background="true" itemRotation="0" outlineWidthM="0.2,mm" zValue="4" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41064302246786966" xmax="18.41493455420295433" ymin="-33.90316824413850583" ymax="-33.89902512102636223"/>
+        <Extent xmin="18.41064302246786966" ymax="-33.89902512102636223" xmax="18.41493455420295433" ymin="-33.90316824413850583"/>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26518,44 +30622,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26578,40 +30682,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26626,29 +30730,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26656,28 +30760,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="1" show="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" inverted="0" name="Overview 1" blendMode="0">
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <ComposerMapOverview centered="1" position="3" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,65,170,127" 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="35,35,35,102" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,65,170,127"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,102"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -26692,9 +30796,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26702,9 +30806,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26714,67 +30818,67 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="3.53,6.0007,mm" zValue="3" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="142,187.018,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="3.53,6.0007,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="false" followPresetName="Marshal map - main" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="3.53,6.0007,mm" size="142,187.018,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal map - main" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41227535330844844" xmax="18.41330222336237554" ymin="-33.9017728906146445" ymax="-33.90042047455022356"/>
+        <Extent xmin="18.41227535330844844" ymax="-33.90042047455022356" xmax="18.41330222336237554" ymin="-33.9017728906146445"/>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26805,44 +30909,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26865,40 +30969,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26913,29 +31017,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26945,20 +31049,20 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="290.617,6.0007,mm" zValue="2" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" visibility="1" blendMode="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionY="0" size="142.117,187.018,mm" referencePoint="2" sectionWidth="142.117" frameJoinStyle="round" id="" sectionHeight="182.4" type="65647" frame="false" opacity="1" sectionX="0" hideBackgroundIfEmpty="0" hidePageIfEmpty="0" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionLock="true" groupUuid="" excludeFromExports="0" position="290.617,6.0007,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" itemRotation="0">
-        <FrameColor alpha="255" red="119" green="119" blue="119"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="290.617,6.0007,mm" size="142.117,187.018,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" opacity="1" blendMode="0" type="65647" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" sectionX="0" referencePoint="2" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" sectionWidth="142.117" sectionY="0" sectionHeight="182.4" positionLock="true" position="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hideBackgroundIfEmpty="0" hidePageIfEmpty="0" id="" frame="false">
+        <FrameColor alpha="255" blue="119" green="119" red="119"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26966,21 +31070,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="246.665,178.41,mm" zValue="1" resizeMode="0" anchorPoint="0" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="27.4317" northMode="0" blendMode="0" pictureHeight="27.6" pictureRotation="0" mapUuid="" northOffset="0" size="47.1065,27.6,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" groupUuid="" excludeFromExports="0" position="246.665,178.41,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="246.665,178.41,mm" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="0" outlineWidthM="0.3,mm" pictureHeight="27.6" zValue="1" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="246.665,178.41,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="27.4317">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26988,14 +31092,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" 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;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#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;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#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 Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&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;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" contentMode="1" stylesheetEnabled="true" url="" maxBreakDistance="12" type="65648" evaluateExpressions="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;}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true">
+      <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;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#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;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#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 Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&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;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" maxBreakDistance="12" type="65648" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" contentMode="1" resizeMode="0" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" 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 uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27005,53 +31109,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="0" name="imageCropMarginUnit" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="rasterize" type="QString"/>
-          <Option value="3.53" name="resizeToContentsBottomMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsLeftMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsRightMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsTopMargin" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="jpg"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropMarginUnit" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="rasterize" value="false"/>
+          <Option type="QString" name="resizeToContentsBottomMargin" value="3.53"/>
+          <Option type="QString" name="resizeToContentsLeftMargin" value="3.53"/>
+          <Option type="QString" name="resizeToContentsRightMargin" value="3.53"/>
+          <Option type="QString" name="resizeToContentsTopMargin" value="3.53"/>
+          <Option type="QString" name="singleFile" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" hideCoverage="0" sortAscending="1" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" enabled="1" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortKey="position" coverageLayerProvider="ogr" pageNameExpression="&quot;position&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortAscending="1" coverageLayerName="marshal_positions" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="position" pageNameExpression="&quot;position&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -27066,49 +31170,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,420,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -27123,9 +31227,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27133,101 +31237,69 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="15.6525,12.5708,mm" size="21.6797,33,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="false" splitLayer="0" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="8" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="15.6525,12.5708,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="286.027,2,mm" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="0" outlineWidthM="0.3,mm" pictureHeight="7.97477" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="286.027,2,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderColor="0,0,0,255" mode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northMode="0" id="" frame="false" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
-          </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
-          </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-        </styles>
-        <layer-tree-group>
-          <customproperties>
-            <Option/>
-          </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
-            <customproperties>
-              <Option/>
-            </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
-              <customproperties>
-                <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-              </customproperties>
-            </layer-tree-layer>
-          </layer-tree-group>
-          <custom-order enabled="0"/>
-        </layer-tree-group>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,399.106,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="MARSHAL POSITIONS" size="45.1194,7.36972,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,399.106,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              </Option>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+      </LayoutItem>
+      <LayoutItem positionOnPage="285.027,205.886,mm" htmlState="0" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="270" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[%upper( &quot;area&quot; )%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27242,65 +31314,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,406.988,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="Page [% &quot;page&quot; %]" size="16.2476,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem lineCapStyle="square" maxBarWidth="150" type="65646" opacity="1" outlineWidthM="0.3,mm" unitType="meters" numSubdivisions="1" positionOnPage="7,189.669,mm" blendMode="0" minBarWidth="50" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" visibility="1" frame="false" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" style="Single Box" alignment="0" labelHorizontalPlacement="0" itemRotation="0" size="145.54,16.2165,mm" positionLock="true" unitLabel="m" referencePoint="0" labelVerticalPlacement="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" zValue="2" subdivisionsHeight="1.5" segmentMillimeters="26.3519" groupUuid="" position="7,189.669,mm" id="" numSegments="4" numUnitsPerSegment="100" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" lineJoinStyle="miter" segmentSizeMode="1" boxContentSpace="1" labelBarSpace="3" frameJoinStyle="miter" numSegmentsLeft="2" background="false" height="3" outlineWidth="0.3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27315,626 +31387,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="214.292,406.988,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.2" size="27.7839,7.51682,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" positionLock="true" groupUuid="" excludeFromExports="0" position="214.292,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="185.72,399.107,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="56.3557,7.36902,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" positionLock="true" groupUuid="" excludeFromExports="0" position="185.72,399.107,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="243.319,382.696,mm" zValue="3" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="31.1059" northMode="0" blendMode="0" pictureHeight="31.2967" pictureRotation="0" mapUuid="" northOffset="0" size="49.3143,31.2967,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" positionLock="true" groupUuid="" excludeFromExports="0" position="243.319,382.696,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.84321,406.626,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="236.083,0.14328,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-            <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <prop k="offset" v="0,0"/>
-            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="offset_unit" v="MM"/>
-            <prop k="outline_color" v="0,0,0,255"/>
-            <prop k="outline_style" v="solid"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.03,5.9483,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="286.94,392.396,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Marshal overview" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.4043547521658617" xmax="18.42124635930919041" ymin="-33.91857233280978789" ymax="-33.89547273009495854"/>
-        <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
-      </LayoutItem>
-      <customproperties>
-        <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-        </Option>
-      </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" filterFeatures="0"/>
-    </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
-      <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-            <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <prop k="offset" v="0,0"/>
-            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="offset_unit" v="MM"/>
-            <prop k="outline_color" v="0,0,0,255"/>
-            <prop k="outline_style" v="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="outline_color" v="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </LayoutItem>
-        <GuideCollection visible="1"/>
-      </PageCollection>
-      <LayoutItem positionOnPage="286.027,2,mm" zValue="4" resizeMode="0" anchorPoint="0" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="6.31767" northMode="0" blendMode="0" pictureHeight="7.97477" pictureRotation="330" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northOffset="0" size="9.45865,11,mm" referencePoint="0" frameJoinStyle="miter" mode="0" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="arrows/NorthArrow_11.svg" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" groupUuid="" excludeFromExports="0" position="286.027,2,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-      </LayoutItem>
-      <LayoutItem positionOnPage="285.027,205.886,mm" zValue="3" visibility="1" blendMode="0" marginY="1" labelText="[%upper( &quot;area&quot; )%]" size="142.543,10.3185,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" groupUuid="" excludeFromExports="0" position="285.027,205.886,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" itemRotation="270">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem subdivisionsHeight="1.5" minBarWidth="50" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" outlineWidth="0.3" id="" maxBarWidth="150" background="false" numMapUnitsPerScaleBarUnit="1" positionOnPage="7,189.669,mm" lineCapStyle="square" size="145.54,16.2165,mm" outlineWidthM="0.3,mm" segmentSizeMode="1" unitType="meters" groupUuid="" height="3" frame="false" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" visibility="1" frameJoinStyle="miter" labelBarSpace="3" numSegments="4" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" segmentMillimeters="26.3519" positionLock="true" unitLabel="m" numUnitsPerSegment="100" numSubdivisions="1" alignment="0" zValue="2" labelVerticalPlacement="0" style="Single Box" labelHorizontalPlacement="0" lineJoinStyle="miter" position="7,189.669,mm" numSegmentsLeft="2" referencePoint="0" itemRotation="0" boxContentSpace="1" opacity="1" blendMode="0" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-        <strokeColor alpha="255" red="0" green="0" blue="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" name="decimal_separator" type="QChar"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
-            <Option value="" name="thousand_separator" type="QChar"/>
+            <Option type="QChar" name="decimal_separator" value=""/>
+            <Option type="int" name="decimals" value="6"/>
+            <Option type="int" name="rounding_type" value="0"/>
+            <Option type="bool" name="show_plus" value="false"/>
+            <Option type="bool" name="show_thousand_separator" value="true"/>
+            <Option type="bool" name="show_trailing_zeros" value="false"/>
+            <Option type="QChar" name="thousand_separator" value=""/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" red="0" green="0" blue="0"/>
-        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.3"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -27965,52 +31486,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.3"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28041,52 +31562,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.3"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28117,36 +31638,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -28161,36 +31682,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28205,87 +31726,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem positionOnPage="7,5.5,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="278.027,180.318,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="330" position="7,5.5,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="false" followPresetName="Start/Finish" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="7,5.5,mm" size="278.027,180.318,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Start/Finish" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="330" positionLock="true" position="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="rotation" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="rotation"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="id" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="id"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="angle"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" xmax="18.41790915398017958" ymin="-33.90494830469008747" ymax="-33.89880140828828559"/>
+        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="3" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="3" gridFrameStyle="0" intervalY="5" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="5" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="3" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" position="3" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="5" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="1" intervalY="5" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="3" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="4" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="195,195,195,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -28316,44 +31837,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -28376,9 +31897,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -28395,32 +31916,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -28435,29 +31956,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28467,63 +31988,63 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
-          <Option value="0" name="svgCropMarginBottom" type="QString"/>
-          <Option value="0" name="svgCropMarginLeft" type="QString"/>
-          <Option value="0" name="svgCropMarginRight" type="QString"/>
-          <Option value="0" name="svgCropMarginTop" type="QString"/>
-          <Option value="true" name="svgCropToContents" type="QString"/>
-          <Option value="0" name="svgDisableRasterTiles" type="QString"/>
-          <Option value="false" name="svgGroupLayers" type="QString"/>
-          <Option value="1" name="svgIncludeMetadata" type="QString"/>
-          <Option value="0" name="svgTextFormat" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="true"/>
+          <Option type="QString" name="svgCropMarginBottom" value="0"/>
+          <Option type="QString" name="svgCropMarginLeft" value="0"/>
+          <Option type="QString" name="svgCropMarginRight" value="0"/>
+          <Option type="QString" name="svgCropMarginTop" value="0"/>
+          <Option type="QString" name="svgCropToContents" value="true"/>
+          <Option type="QString" name="svgDisableRasterTiles" value="0"/>
+          <Option type="QString" name="svgGroupLayers" value="false"/>
+          <Option type="QString" name="svgIncludeMetadata" value="1"/>
+          <Option type="QString" name="svgTextFormat" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="start_finish_area" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortKey="area" coverageLayerProvider="ogr" pageNameExpression="&quot;area&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortAscending="1" coverageLayerName="start_finish_area" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="area" pageNameExpression="&quot;area&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="300" name="Fencing">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -28538,49 +32059,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28595,9 +32116,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28605,47 +32126,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionOnPage="6.76779,190.27,mm" zValue="11" visibility="1" blendMode="0" marginY="1" labelText="FENCING: [% &quot;name&quot; %]" size="148.46,7.36972,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" groupUuid="" excludeFromExports="0" position="6.76779,190.27,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="6.76779,190.27,mm" htmlState="0" size="148.46,7.36972,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="11" referencePoint="0" excludeFromExports="0" visibility="1" labelText="FENCING: [% &quot;name&quot; %]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28660,65 +32181,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="211.295,197.64,mm" zValue="10" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.0" size="27.7839,7.51682,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" groupUuid="" excludeFromExports="0" position="211.295,197.64,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="211.295,197.64,mm" htmlState="0" size="27.7839,7.51682,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="10" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28733,65 +32254,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="115.637,198.083,mm" zValue="9" visibility="1" blendMode="0" marginY="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" size="67.0856,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" groupUuid="" excludeFromExports="0" position="115.637,198.083,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="115.637,198.083,mm" htmlState="0" size="67.0856,7.80192,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28806,65 +32327,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="59.5581,198.083,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" size="53.0017,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" groupUuid="" excludeFromExports="0" position="59.5581,198.083,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="59.5581,198.083,mm" htmlState="0" size="53.0017,7.80192,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28879,65 +32400,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.76779,198.083,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="Page [% @atlas_featurenumber %]" size="52.7903,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" groupUuid="" excludeFromExports="0" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="6.76779,198.083,mm" htmlState="0" size="52.7903,7.80192,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Page [% @atlas_featurenumber %]" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28952,39 +32473,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="243.098,175.353,mm" zValue="6" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="29.6535" northMode="0" blendMode="0" pictureHeight="29.8354" pictureRotation="0" mapUuid="" northOffset="0" size="49.3143,29.8354,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" groupUuid="" excludeFromExports="0" position="243.098,175.353,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="243.098,175.353,mm" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="29.8354" zValue="6" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="243.098,175.353,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="29.6535">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28992,47 +32513,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="182.723,190.271,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 September 2020" size="56.3557,7.36902,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" groupUuid="" excludeFromExports="0" position="182.723,190.271,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="182.723,190.271,mm" htmlState="0" size="56.3557,7.36902,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 September 2020" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29047,60 +32568,60 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.91779,197.79,mm" zValue="4" visibility="1" shapeType="1" blendMode="0" size="232.01,0.14328,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" groupUuid="" excludeFromExports="0" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="6.91779,197.79,mm" size="232.01,0.14328,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -29115,55 +32636,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem subdivisionsHeight="1.5" minBarWidth="25" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" outlineWidth="0.2" id="" maxBarWidth="100" background="false" numMapUnitsPerScaleBarUnit="1" positionOnPage="6.76779,2.8482,mm" lineCapStyle="square" size="95.0404,15.8378,mm" outlineWidthM="0.3,mm" segmentSizeMode="1" unitType="meters" groupUuid="" height="2" frame="false" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" visibility="1" frameJoinStyle="miter" labelBarSpace="1" numSegments="2" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" segmentMillimeters="28.4264" positionLock="true" unitLabel="m" numUnitsPerSegment="10" numSubdivisions="1" alignment="0" zValue="3" labelVerticalPlacement="0" style="Double Box" labelHorizontalPlacement="0" lineJoinStyle="round" position="6.76779,2.8482,mm" numSegmentsLeft="2" referencePoint="0" itemRotation="0" boxContentSpace="0.2" opacity="1" blendMode="0" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem lineCapStyle="square" maxBarWidth="100" type="65646" opacity="1" outlineWidthM="0.3,mm" unitType="meters" numSubdivisions="1" positionOnPage="6.76779,2.8482,mm" blendMode="0" minBarWidth="25" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" visibility="1" frame="false" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" style="Double Box" alignment="0" labelHorizontalPlacement="0" itemRotation="0" size="95.0404,15.8378,mm" positionLock="true" unitLabel="m" referencePoint="0" labelVerticalPlacement="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" zValue="3" subdivisionsHeight="1.5" segmentMillimeters="28.4264" groupUuid="" position="6.76779,2.8482,mm" id="" numSegments="2" numUnitsPerSegment="10" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" lineJoinStyle="round" segmentSizeMode="1" boxContentSpace="0.2" labelBarSpace="1" frameJoinStyle="miter" numSegmentsLeft="2" background="false" height="2" outlineWidth="0.2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29178,75 +32699,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" red="0" green="0" blue="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" name="decimal_separator" type="QChar"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
-            <Option value="" name="thousand_separator" type="QChar"/>
+            <Option type="QChar" name="decimal_separator" value=""/>
+            <Option type="int" name="decimals" value="6"/>
+            <Option type="int" name="rounding_type" value="0"/>
+            <Option type="bool" name="show_plus" value="false"/>
+            <Option type="bool" name="show_thousand_separator" value="true"/>
+            <Option type="bool" name="show_trailing_zeros" value="false"/>
+            <Option type="QChar" name="thousand_separator" value=""/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" red="0" green="0" blue="0"/>
-        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.2"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29277,52 +32798,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.2"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29353,52 +32874,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.2"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29429,36 +32950,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -29473,36 +32994,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29517,24 +33038,24 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="256.808,2.9982,mm" size="38.1563,54.9504,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="true" splitLayer="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" resizeToContents="0" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="2" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="256.808,2.9982,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="0" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="256.808,2.9982,mm" blendMode="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="38.1563,54.9504,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" zValue="2" rasterBorder="1" groupUuid="" position="256.808,2.9982,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter" title="" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29542,52 +33063,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" style="Bold"/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="Bold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="group" marginTop="3">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="3">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2.5">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones" groupLayer="">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" name="fencing">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option type="QString" name="legend/expressionFilter" value=""/>
+                  <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29595,44 +33116,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.76779,9.35102,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="283.418,180.92,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="0.9" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="false" followPresetName="Fencing" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="6.76779,9.35102,mm" size="283.418,180.92,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Fencing" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option value="1" name="exponent" type="double"/>
-                      <Option value="360" name="maxOutput" type="double"/>
-                      <Option value="0" name="maxValue" type="double"/>
-                      <Option value="0" name="minOutput" type="double"/>
-                      <Option value="0" name="minValue" type="double"/>
-                      <Option value="0" name="nullOutput" type="double"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option type="double" name="exponent" value="1"/>
+                      <Option type="double" name="maxOutput" value="360"/>
+                      <Option type="double" name="maxValue" value="0"/>
+                      <Option type="double" name="minOutput" value="0"/>
+                      <Option type="double" name="minValue" value="0"/>
+                      <Option type="double" name="nullOutput" value="0"/>
                     </Option>
-                    <Option value="0" name="t" type="int"/>
+                    <Option type="int" name="t" value="0"/>
                   </Option>
-                  <Option value="3" name="type" type="int"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="angle"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41635400827248503" xmax="18.4172496509604926" ymin="-33.90421228789515595" ymax="-33.90364055490629625"/>
+        <Extent xmin="18.41635400827248503" ymax="-33.90364055490629625" xmax="18.4172496509604926" ymin="-33.90421228789515595"/>
         <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>
@@ -29647,45 +33168,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="3" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="3" gridFrameStyle="0" intervalY="5" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="5" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="3" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" position="3" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="5" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="1" intervalY="5" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="3" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="4" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="195,195,195,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29716,44 +33237,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29776,9 +33297,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29795,32 +33316,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -29835,29 +33356,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29867,60 +33388,60 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="QString"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="QString"/>
-          <Option value="1" name="pdfSimplify" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="rasterize" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfAppendGeoreference" value="1"/>
+          <Option type="QString" name="pdfCreateGeoPdf" value="0"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
+          <Option type="QString" name="pdfExportThemes" value=""/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfOgcBestPracticeFormat" value="0"/>
+          <Option type="QString" name="pdfSimplify" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="rasterize" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" sortFeatures="1" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="fence_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortKey="group" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortAscending="1" coverageLayerName="fence_groups" coverageLayerProvider="virtual" filterFeatures="0" sortFeatures="1" sortKey="group" pageNameExpression="&quot;name&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" name="Ask Me">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="9" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="9" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -29935,49 +33456,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29992,59 +33513,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="4.43449,186.634,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="Directions to Start of Race" size="83.9998,10.4638,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" groupUuid="" excludeFromExports="0" position="4.43449,186.634,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="4.43449,186.634,mm" htmlState="0" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Directions to Start of Race" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="false" position="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30059,65 +33580,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.43449,197.498,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="Gun Run" size="48.2923,9.511,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" groupUuid="" excludeFromExports="0" position="4.43449,197.498,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="4.43449,197.498,mm" htmlState="0" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Gun Run" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="false" position="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30132,33 +33653,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="0" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="10.096,10.8563,mm" size="59.0766,76,mm" title="" rasterBorder="1" symbolWidth="9" outlineWidthM="0.3,mm" equalColumnWidth="0" titleAlignment="1" symbolHeight="5" fontColor="#000000" groupUuid="" frame="true" legendFilterByMap="1" splitLayer="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" frameJoinStyle="round" wmsLegendWidth="50" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" resizeToContents="1" symbolAlignment="1" positionLock="false" rasterBorderColor="0,0,0,255" wrapChar="" zValue="6" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="10.096,10.8563,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="2" excludeFromExports="0">
-        <FrameColor alpha="255" red="139" green="139" blue="139"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="5" columnSpace="0" positionOnPage="10.096,10.8563,mm" blendMode="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="59.0766,76,mm" positionLock="false" referencePoint="0" symbolAlignment="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" zValue="6" rasterBorder="1" groupUuid="" position="10.096,10.8563,mm" id="" lineSpacing="2" symbolWidth="9" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="round" title="" legendFilterByMap="1" background="true">
+        <FrameColor alpha="255" blue="139" green="139" red="139"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30166,52 +33687,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2.5">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="3" indent="0" name="symbolLabel" marginTop="2.5">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" marginLeft="3" name="symbolLabel" indent="0" marginTop="2.5">
+            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Ask Me" groupLayer="">
+          <layer-tree-group name="Ask Me" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" name="legend/title-style" type="QString"/>
+                <Option type="QString" name="legend/title-style" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" checked="Qt::Checked" name="poi_labels">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" source="./poi_labels.shp|layername=poi_labels" legend_exp="" name="poi_labels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" name="legend/label-0" type="QString"/>
-                  <Option value="Toilets" name="legend/label-1" type="QString"/>
-                  <Option value="Tog Bag Drop-off" name="legend/label-2" type="QString"/>
-                  <Option value="Road Closed to Cars" name="legend/label-3" type="QString"/>
-                  <Option value="MyCiti Drop-off" name="legend/label-4" type="QString"/>
-                  <Option value="Parking" name="legend/label-5" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="legend/label-0" value="Start/Finish"/>
+                  <Option type="QString" name="legend/label-1" value="Toilets"/>
+                  <Option type="QString" name="legend/label-2" value="Tog Bag Drop-off"/>
+                  <Option type="QString" name="legend/label-3" value="Road Closed to Cars"/>
+                  <Option type="QString" name="legend/label-4" value="MyCiti Drop-off"/>
+                  <Option type="QString" name="legend/label-5" value="Parking"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" checked="Qt::Checked" name="directions_to_start">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" name="directions_to_start" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
-                  <Option value="To 10KM Start (07:30)" name="legend/label-1" type="QString"/>
-                  <Option value="To 5KM Start (08:30)" name="legend/label-2" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="legend/label-0" value="To 21KM Start (06:30)"/>
+                  <Option type="QString" name="legend/label-1" value="To 10KM Start (07:30)"/>
+                  <Option type="QString" name="legend/label-2" value="To 5KM Start (08:30)"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30219,47 +33740,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="221.862,190.027,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.0" size="27.7839,6.871,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" groupUuid="" excludeFromExports="0" position="221.862,190.027,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="221.862,190.027,mm" htmlState="0" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="false" position="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30274,65 +33795,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="197.975,197.498,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" groupUuid="" excludeFromExports="0" position="197.975,197.498,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="197.975,197.498,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="false" position="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30347,39 +33868,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="249.646,179.724,mm" zValue="3" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="24.2337" northMode="0" blendMode="0" pictureHeight="24.3824" pictureRotation="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northOffset="0" size="42.9838,24.3824,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" groupUuid="" excludeFromExports="0" position="249.646,179.724,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="249.646,179.724,mm" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="24.3824" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="249.646,179.724,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="24.2337">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30387,42 +33908,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.58449,197.248,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="244.912,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" groupUuid="" excludeFromExports="0" position="4.58449,197.248,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="4.58449,197.248,mm" size="244.912,0.1,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -30437,46 +33958,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.43449,6.411,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="288.007,183.616,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" groupUuid="" excludeFromExports="0" mapRotation="0" position="4.43449,6.411,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Ask Me" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="4.43449,6.411,mm" size="288.007,183.616,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Ask Me" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="false" position="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" xmax="18.41789384089274151" ymin="-33.90994364588821952" ymax="-33.8970204297764468"/>
+        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" xmax="18.41789384089274151" ymin="-33.90994364588821952"/>
         <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>
@@ -30491,45 +34012,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30560,44 +34081,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30620,40 +34141,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30668,29 +34189,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30700,54 +34221,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="" sortFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" pageNameExpression="" filterFeatures="0"/>
+      <Atlas coverageLayer="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" sortFeatures="0" pageNameExpression="" enabled="0"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="144" name="All Routes">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="All Routes" units="mm" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30762,49 +34283,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30819,59 +34340,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="200.171,199.082,mm" zValue="13" visibility="1" blendMode="0" marginY="1" labelText="REVISION 2.4" size="61.5373,6.8714,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" groupUuid="" excludeFromExports="0" position="200.171,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="200.171,199.082,mm" htmlState="0" size="61.5373,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="13" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 2.5" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30886,65 +34407,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.7863,192.073,mm" zValue="12" visibility="1" blendMode="0" marginY="1" labelText="Gun Run 2022: [%&quot;Source&quot;%]" size="61.5373,6.60801,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.7863,192.073,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.7863,192.073,mm" htmlState="0" size="61.5373,6.60801,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="12" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Gun Run 2022: [%&quot;Source&quot;%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30959,65 +34480,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.7863,199.082,mm" zValue="11" visibility="1" blendMode="0" marginY="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" size="61.5373,6.60801,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.7863,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.7863,199.082,mm" htmlState="0" size="61.5373,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="11" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31032,39 +34553,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" zValue="10" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="29.7523" northMode="0" blendMode="0" pictureHeight="15.9472" pictureRotation="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" northOffset="0" size="29.7523,17.4718,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../GunRun2022_250.png" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" groupUuid="" excludeFromExports="0" position="262.196,188.218,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="15.9472" zValue="10" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" northMode="0" id="" frame="false" file="../GunRun2022_250.png" pictureWidth="29.7523">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31072,42 +34593,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.57644,198.832,mm" zValue="9" visibility="1" shapeType="1" blendMode="0" size="251.982,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.57644,198.832,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.57644,198.832,mm" size="251.982,0.1,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31122,321 +34643,321 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.57644,5.42566,mm" zValue="8" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="107.861,186.385,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Trail Finish" type="65639" frame="true" opacity="1" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.57644,5.42566,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.57644,5.42566,mm" size="107.861,186.385,mm" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="9.57644,5.42566,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" mapFlags="0" id="Trail Finish" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" xmax="18.41187375074135701" ymin="-33.93243205975926458" ymax="-33.90007566747966905"/>
+        <Extent xmin="18.39314911415855391" ymax="-33.90007566747966905" xmax="18.41187375074135701" ymin="-33.93243205975926458"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="112.643,4.09761,mm" zValue="7" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="179.156,189.279,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Trail Start" type="65639" frame="true" opacity="1" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="112.643,4.09761,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="112.643,4.09761,mm" size="179.156,189.279,mm" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="112.643,4.09761,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" mapFlags="0" id="Trail Start" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" xmax="18.42354248737832023" ymin="-33.95772328900195447" ymax="-33.92484901666441743"/>
+        <Extent xmin="18.3924263991010406" ymax="-33.92484901666441743" xmax="18.42354248737832023" ymin="-33.95772328900195447"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" zValue="6" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="67.7828,166.874,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Left inset 21KM" type="65639" frame="true" opacity="1" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Routes" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" id="Left inset 21KM" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" xmax="18.38626092146919788" ymin="-33.94700000000000273" ymax="-33.91681492292400435"/>
+        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="126.141,118.975,mm" zValue="5" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="113.3,76.1023,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Bottom inset 21KM" type="65639" frame="true" opacity="1" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="126.141,118.975,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" itemRotation="0">
-        <FrameColor alpha="255" red="103" green="34" blue="144"/>
-        <BackgroundColor alpha="255" red="200" green="175" blue="215"/>
+      <LayoutItem positionOnPage="126.141,118.975,mm" size="113.3,76.1023,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="126.141,118.975,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" id="Bottom inset 21KM" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="144" green="34" red="103"/>
+        <BackgroundColor alpha="255" blue="215" green="175" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" xmax="18.42329132157224336" ymin="-33.9168317482614512" ymax="-33.91132718340826813"/>
+        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
         <LayerSet/>
         <AtlasMap scalingMode="0" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="19.6693,7.89412,mm" zValue="4" visibility="0" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="68.3676,117.12,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="End inset Trail" type="65639" frame="true" opacity="1" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="19.6693,7.89412,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="19.6693,7.89412,mm" size="68.3676,117.12,mm" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="19.6693,7.89412,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" mapFlags="0" id="End inset Trail" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" xmax="18.41240136424316276" ymin="-33.91454383501641701" ymax="-33.90099106513847005"/>
+        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" xmax="18.41240136424316276" ymin="-33.91454383501641701"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="170.062,49.6297,mm" zValue="3" visibility="0" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="63.655,88.3012,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Start inset Trail" type="65639" frame="true" opacity="1" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="170.062,49.6297,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="170.062,49.6297,mm" size="63.655,88.3012,mm" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="170.062,49.6297,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" mapFlags="0" id="Start inset Trail" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41445559427620893" xmax="18.4185691326545431" ymin="-33.94823764719958348" ymax="-33.94253141264477591"/>
+        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" xmax="18.4185691326545431" ymin="-33.94823764719958348"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="200.321,125.314,mm" zValue="2" visibility="0" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="75.8756,69.7635,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Contour inset Trail" type="65639" frame="true" opacity="1" uuid="{917a530c-14f4-4ed8-b109-961939435221}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="200.321,125.314,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="200.321,125.314,mm" size="75.8756,69.7635,mm" uuid="{917a530c-14f4-4ed8-b109-961939435221}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="200.321,125.314,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" mapFlags="0" id="Contour inset Trail" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41234259163472942" xmax="18.42332635419156972" ymin="-33.95702588572736147" ymax="-33.94692690566557047"/>
+        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" xmax="18.42332635419156972" ymin="-33.95702588572736147"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.50144,5.50066,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="282.372,186.234,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="round" id="Main Map" type="65639" frame="true" opacity="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.50144,5.50066,mm" outlineWidthM="0.15,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.50144,5.50066,mm" size="282.372,186.234,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" id="Main Map" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3985'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3985'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36400000000000077" xmax="18.4538899796794631" ymin="-33.95900000000000318" ymax="-33.89971434483381074"/>
+        <Extent xmin="18.36400000000000077" ymax="-33.89971434483385337" xmax="18.4538899796794631" ymin="-33.95900000000000318"/>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31467,44 +34988,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31527,40 +35048,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31575,29 +35096,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31605,34 +35126,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="0" show="1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" inverted="0" name="Overview 1" blendMode="0">
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <ComposerMapOverview centered="0" position="3" name="Overview 1" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="alpha" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                <Option type="QString" name="name" value=""/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="alpha">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="103,34,144,26" 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="103,34,144,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="103,34,144,26"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="103,34,144,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="103,34,144,26"/>
@@ -31647,9 +35168,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31657,9 +35178,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31669,61 +35190,61 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <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_cbaea960_3348_4aea_b155_46e5d310f792~~~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~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="int" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="int" name="pdfAppendGeoreference" value="1"/>
+          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
+          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfExportThemes" value=""/>
+          <Option type="int" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfLayerOrder" 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_cbaea960_3348_4aea_b155_46e5d310f792~~~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~~~route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
+          <Option type="int" name="pdfLosslessImages" value="0"/>
+          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
+          <Option type="int" name="pdfSimplify" value="1"/>
+          <Option type="int" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" hideCoverage="0" sortAscending="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr" pageNameExpression="&quot;Distance&quot;" filterFeatures="1"/>
+      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" coverageLayerName="all_routes" coverageLayerProvider="ogr" filterFeatures="1" sortFeatures="1" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan A1">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31738,49 +35259,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="594,841,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31795,9 +35316,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31805,15 +35326,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="25.5925,18.7971,mm" size="4,4,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="false" splitLayer="0" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="8" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="25.5925,18.7971,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="25.5925,18.7971,mm" blendMode="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" fontColor="#000000" wrapChar="" frame="false" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="4,4,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" zValue="8" rasterBorder="1" groupUuid="" position="25.5925,18.7971,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter" title="" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31821,37 +35342,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" legend_exp="" id="all_routes20170907054841602" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="QString"/>
+                  <Option type="QString" name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option type="QString" name="showFeatureCount" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31859,47 +35380,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.2963,808.939,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="MARSHAL POSITIONS" size="91.9494,15.0649,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.2963,808.939,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.2963,808.939,mm" htmlState="0" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31914,65 +35435,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="430.403,825.052,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.2" size="56.6212,15.3656,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" groupUuid="" excludeFromExports="0" position="430.403,825.052,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="430.403,825.052,mm" htmlState="0" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.2" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31987,65 +35508,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="372.175,808.942,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="114.848,15.0635,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" groupUuid="" excludeFromExports="0" position="372.175,808.942,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="372.175,808.942,mm" htmlState="0" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32060,39 +35581,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="489.557,775.395,mm" zValue="3" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="63.5856" northMode="0" blendMode="0" pictureHeight="63.9757" pictureRotation="0" mapUuid="" northOffset="0" size="100.498,63.9757,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" groupUuid="" excludeFromExports="0" position="489.557,775.395,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="489.557,775.395,mm" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="63.9757" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="489.557,775.395,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="63.5856">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32100,42 +35621,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.4463,824.155,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="481.428,0.606138,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.4463,824.155,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.4463,824.155,mm" size="481.428,0.606138,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32150,90 +35671,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="3.94474,5.25965,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="584.759,811.213,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="true" opacity="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="3.94474,5.25965,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Marshal overview" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="3.94474,5.25965,mm" size="584.759,811.213,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal overview" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" xmax="18.42299397558693741" ymin="-33.95821655848814657" ymax="-33.89072661913806428"/>
+        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="complete_marshal_overview" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortKey="page" coverageLayerProvider="virtual" pageNameExpression="&quot;page&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortAscending="1" coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" filterFeatures="0" sortFeatures="1" sortKey="page" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="144" name="Access Roads">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32248,49 +35769,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32305,27 +35826,27 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="244.484,130.172,mm" size="34.45,40.8,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="0" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="true" splitLayer="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="15" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="244.484,130.172,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="185" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="244.484,130.172,mm" blendMode="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="34.45,40.8,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" zValue="15" rasterBorder="1" groupUuid="" position="244.484,130.172,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="0" frameJoinStyle="miter" title="" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32333,35 +35854,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="group" marginTop="3">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="3">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2.5">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Residents Access" groupLayer="">
+          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" checked="Qt::Checked" name="residents_access_roads">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" name="residents_access_roads" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32369,47 +35890,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.37446,191.81,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="ACCESS ROUTES FOR RESIDENTS" size="194.851,7.272,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.37446,191.81,mm" htmlState="0" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="ACCESS ROUTES FOR RESIDENTS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32424,65 +35945,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.1" size="57.4836,6.8714,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" groupUuid="" excludeFromExports="0" position="204.225,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32497,65 +36018,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" groupUuid="" excludeFromExports="0" position="210.038,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32570,39 +36091,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" zValue="4" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="17.3653" northMode="0" blendMode="0" pictureHeight="17.4718" pictureRotation="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" northOffset="0" size="29.7523,17.4718,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" groupUuid="" excludeFromExports="0" position="262.196,188.218,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32610,42 +36131,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" zValue="3" visibility="1" shapeType="1" blendMode="0" size="251.959,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32660,61 +36181,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" zValue="2" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="67.7828,166.874,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="true" opacity="1" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Access Routes" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Access Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
+        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
         <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>
@@ -32729,45 +36250,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -32798,44 +36319,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -32858,40 +36379,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -32906,29 +36427,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32938,43 +36459,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,9.08557,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="282.012,175.592,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="round" id="" type="65639" frame="true" opacity="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm" drawCanvasItems="false" background="true" followPresetName="Access Routes" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.44946,9.08557,mm" size="282.012,175.592,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Access Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" xmax="18.42303507276415431" ymin="-33.92999999999999972" ymax="-33.89697816224119009"/>
+        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" xmax="18.42303507276415431" ymin="-33.92999999999999972"/>
         <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>
@@ -32989,45 +36510,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33058,44 +36579,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33118,40 +36639,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33166,29 +36687,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33198,54 +36719,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="1" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" name="Golf Course Access">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33260,49 +36781,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33317,59 +36838,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="9.37446,191.81,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="Access to P9 Parking and VIP Tent" size="194.851,7.272,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.37446,191.81,mm" htmlState="0" size="194.851,7.272,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Access to P9 Parking and VIP Tent" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33384,65 +36905,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.0" size="57.4836,6.8714,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" groupUuid="" excludeFromExports="0" position="204.225,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33457,65 +36978,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" groupUuid="" excludeFromExports="0" position="210.038,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33530,39 +37051,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" zValue="4" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="17.3653" northMode="0" blendMode="0" pictureHeight="17.4718" pictureRotation="0" mapUuid="" northOffset="0" size="29.7523,17.4718,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" groupUuid="" excludeFromExports="0" position="262.196,188.218,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33570,42 +37091,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" zValue="3" visibility="1" shapeType="1" blendMode="0" size="251.959,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33620,46 +37141,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,7.25098,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="false" mapFlags="0" size="282.012,182.649,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="round" id="" type="65639" frame="false" opacity="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionLock="false" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.44946,7.25098,mm" outlineWidthM="0.15,mm" drawCanvasItems="false" background="true" followPresetName="" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.44946,7.25098,mm" size="282.012,182.649,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="false" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="false" position="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" xmax="18.40919746780259914" ymin="-33.90848231674397084" ymax="-33.90319854486631357"/>
+        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" xmax="18.40919746780259914" ymin="-33.90848231674397084"/>
         <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>
@@ -33674,45 +37195,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33743,44 +37264,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33803,40 +37324,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33851,29 +37372,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33883,54 +37404,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="0" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" enabled="0"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan Day 1">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33945,49 +37466,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,420,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,420,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34002,9 +37523,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34012,15 +37533,88 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="15.6525,12.5708,mm" size="21.6797,33,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="false" splitLayer="0" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="8" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="15.6525,12.5708,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="112.086,406.476,mm" htmlState="1" size="23.5967,8.3142,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="14" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Page [% &quot;page&quot; %] " groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="112.086,406.476,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" marginX="0" halign="4" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <Option type="Map">
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
+                </Option>
+                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="color" v="255,255,255,255"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="128,128,128,255"/>
+                <prop k="outline_style" v="no"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="style" v="solid"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="15.6525,12.5708,mm" blendMode="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" fontColor="#000000" wrapChar="" frame="false" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="21.6797,33,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" zValue="8" rasterBorder="1" groupUuid="" position="15.6525,12.5708,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frameJoinStyle="miter" title="" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34028,37 +37622,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option type="int" name="showFeatureCount" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34066,47 +37660,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,399.106,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="MARSHAL POSITIONS" size="45.1194,7.36972,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,399.106,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.69321,398.344,mm" htmlState="0" size="45.1194,8.13137,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="5.69321,398.344,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34121,65 +37715,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,406.988,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="Page [% &quot;page&quot; %]" size="16.2476,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.69321,406.988,mm" htmlState="1" size="118.192,7.80192,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="5.69321,406.988,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34194,65 +37788,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="214.292,406.988,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 2.0" size="27.7839,7.51682,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" groupUuid="" excludeFromExports="0" position="214.292,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="214.292,406.874,mm" htmlState="0" size="27.7839,7.51682,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 3.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="214.292,406.874,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginX="0" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34267,65 +37861,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="148.5,399.107,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="[%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;%]" size="93.5757,7.36902,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionLock="false" groupUuid="" excludeFromExports="0" position="148.5,399.107,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="148.501,398.344,mm" htmlState="1" size="93.5757,8.13167,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="&lt;strong>[%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;/strong>" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="148.501,398.344,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" marginX="0" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34340,39 +37934,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="243.319,382.696,mm" zValue="3" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="49.3143" northMode="0" blendMode="0" pictureHeight="26.4325" pictureRotation="0" mapUuid="" northOffset="0" size="49.3143,31.2967,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../GunRun2022_250.png" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionLock="true" groupUuid="" excludeFromExports="0" position="243.319,382.696,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="243.319,382.696,mm" size="49.3143,31.2967,mm" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="26.4325" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="243.319,382.696,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../GunRun2022_250.png" pictureWidth="49.3143">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34380,42 +37974,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.84321,406.626,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="236.083,0.14328,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.84321,406.626,mm" size="236.083,0.14328,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="5.84321,406.626,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34430,668 +38024,78 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.03,5.9483,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="286.94,392.396,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Marshal overview" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.03,5.9483,mm" size="286.94,392.396,mm" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal overview" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.03,5.9483,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3928927268106257" xmax="18.40978433395395442" ymin="-33.93775368136344639" ymax="-33.91465407864861703"/>
+        <Extent xmin="18.36924763341120581" ymax="-33.9248732774534929" xmax="18.38613924055453452" ymin="-33.94797288016832226"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <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_cbaea960_3348_4aea_b155_46e5d310f792~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1~~~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" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="int" name="forceVector" value="0"/>
+          <Option type="int" name="pdfAppendGeoreference" value="1"/>
+          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
+          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfExportThemes" value=""/>
+          <Option type="int" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfLayerOrder" 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_cbaea960_3348_4aea_b155_46e5d310f792~~~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_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
+          <Option type="int" name="pdfLosslessImages" value="0"/>
+          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
+          <Option type="int" name="pdfSimplify" value="1"/>
+          <Option type="int" name="pdfTextFormat" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" featureFilter="regexp_match( &quot;day&quot;, '1' )" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" filterFeatures="1"/>
-    </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan Day 2">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
-      <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-            <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <prop k="offset" v="0,0"/>
-            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="offset_unit" v="MM"/>
-            <prop k="outline_color" v="0,0,0,255"/>
-            <prop k="outline_style" v="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,420,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{1d6ee08b-2bae-454e-9747-92fe53ff794e}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{1d6ee08b-2bae-454e-9747-92fe53ff794e}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="outline_color" v="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </LayoutItem>
-        <GuideCollection visible="1"/>
-      </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="15.6525,12.5708,mm" size="21.6797,33,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="false" splitLayer="0" uuid="{80d2d637-cb6b-4919-8d13-8e8608fc27b9}" map_uuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{80d2d637-cb6b-4919-8d13-8e8608fc27b9}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="8" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="15.6525,12.5708,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
-          </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
-          </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-        </styles>
-        <layer-tree-group>
-          <customproperties>
-            <Option/>
-          </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
-            <customproperties>
-              <Option/>
-            </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
-              <customproperties>
-                <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
-                </Option>
-              </customproperties>
-            </layer-tree-layer>
-          </layer-tree-group>
-          <custom-order enabled="0"/>
-        </layer-tree-group>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,399.106,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="MARSHAL POSITIONS" size="45.1194,7.36972,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{21317d02-e72f-414d-80e6-3dc4704f496e}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,399.106,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{21317d02-e72f-414d-80e6-3dc4704f496e}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,406.988,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="Page [% &quot;page&quot; %]" size="16.2476,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{043d6b93-d56f-4b5b-943a-bae20902ecc2}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{043d6b93-d56f-4b5b-943a-bae20902ecc2}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="214.292,406.988,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 2.0" size="27.7839,7.51682,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{767bf4e2-dd2d-40bf-a1a1-2a0799413ce0}" positionLock="true" groupUuid="" excludeFromExports="0" position="214.292,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{767bf4e2-dd2d-40bf-a1a1-2a0799413ce0}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="148.5,399.107,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="[%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;%]" size="93.5757,7.36902,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{d293ba25-5164-4566-9ce7-61cb613b0bc1}" positionLock="true" groupUuid="" excludeFromExports="0" position="148.5,399.107,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{d293ba25-5164-4566-9ce7-61cb613b0bc1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="243.319,382.696,mm" zValue="3" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="49.3143" northMode="0" blendMode="0" pictureHeight="26.4325" pictureRotation="0" mapUuid="" northOffset="0" size="49.3143,31.2967,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../GunRun2022_250.png" uuid="{b3ed3305-8f0b-47bc-81b5-23c34cc7f4e9}" positionLock="true" groupUuid="" excludeFromExports="0" position="243.319,382.696,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{b3ed3305-8f0b-47bc-81b5-23c34cc7f4e9}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.84321,406.626,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="236.083,0.14328,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{a24294c4-895b-4801-b08b-9e3763b298cf}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{a24294c4-895b-4801-b08b-9e3763b298cf}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-            <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <prop k="offset" v="0,0"/>
-            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="offset_unit" v="MM"/>
-            <prop k="outline_color" v="0,0,0,255"/>
-            <prop k="outline_style" v="solid"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.03,5.9483,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="286.94,392.396,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Marshal overview" templateUuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.36924763341120581" xmax="18.38613924055453452" ymin="-33.94797288016832226" ymax="-33.9248732774534929"/>
-        <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
-      </LayoutItem>
-      <customproperties>
-        <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <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_cbaea960_3348_4aea_b155_46e5d310f792~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1~~~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" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-        </Option>
-      </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" featureFilter="regexp_match( &quot;day&quot;, '2' )" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" filterFeatures="1"/>
+      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortAscending="1" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="page" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.39752218252544935" xmax="18.40000421553460797" ymin="-33.90642284955147545" ymax="-33.90508771997006932">
+    <DefaultViewExtent xmin="18.31333691080681803" ymax="-33.87127486098422935" xmax="18.47461092490271284" ymin="-33.95802701381087729">
       <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>
@@ -35105,41 +38109,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 timeStepUnit="h" timeStep="1" cumulativeTemporalRange="0" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider offset="0" scale="1"/>
+      <TerrainProvider scale="1" offset="0"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option value="" name="decimal_separator" type="QChar"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="direction_format" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
-        <Option value="" name="thousand_separator" type="QChar"/>
+        <Option type="QChar" name="decimal_separator" value=""/>
+        <Option type="int" name="decimals" value="6"/>
+        <Option type="int" name="direction_format" value="0"/>
+        <Option type="int" name="rounding_type" value="0"/>
+        <Option type="bool" name="show_plus" value="false"/>
+        <Option type="bool" name="show_thousand_separator" value="true"/>
+        <Option type="bool" name="show_trailing_zeros" value="false"/>
+        <Option type="QChar" name="thousand_separator" value=""/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" name="angle_format" type="QString"/>
-        <Option value="" name="decimal_separator" type="QChar"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_leading_degree_zeros" type="bool"/>
-        <Option value="false" name="show_leading_zeros" type="bool"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="false" name="show_suffix" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
-        <Option value="" name="thousand_separator" type="QChar"/>
+        <Option type="QString" name="angle_format" value="DecimalDegrees"/>
+        <Option type="QChar" name="decimal_separator" value=""/>
+        <Option type="int" name="decimals" value="6"/>
+        <Option type="int" name="rounding_type" value="0"/>
+        <Option type="bool" name="show_leading_degree_zeros" value="false"/>
+        <Option type="bool" name="show_leading_zeros" value="false"/>
+        <Option type="bool" name="show_plus" value="false"/>
+        <Option type="bool" name="show_suffix" value="false"/>
+        <Option type="bool" name="show_thousand_separator" value="true"/>
+        <Option type="bool" name="show_trailing_zeros" value="false"/>
+        <Option type="QChar" name="thousand_separator" value=""/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/Gun Run.qgs.mldata b/GIS Base Map/Gun Run.qgs.mldata
index bd38a7e..ba3d08e 100644
Binary files a/GIS Base Map/Gun Run.qgs.mldata and b/GIS Base Map/Gun Run.qgs.mldata differ
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index a816693..4af4b6f 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.26.2-Buenos Aires" saveUser="tim" saveUserFull="Timothy Allen" projectname="Gun Run" saveDateTime="2022-08-28T15:21:09">
+<qgis saveUser="tim" saveDateTime="2022-08-30T11:53:13" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,248 +21,255 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Marshals" groupLayer="">
+    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_split_behavior="0" checked="Qt::Checked" name="marshal_positions">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" name="marshal_positions" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions" name="cached_name" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option type="QString" name="cached_name" value="marshal_positions"/>
+            <Option type="QString" name="legend/expressionFilter" value=""/>
+            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <Option type="int" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./extra_security.shp" legend_exp="" providerKey="ogr" id="extra_security20170921130834191" legend_split_behavior="0" checked="Qt::Unchecked" name="extra_security">
+      <layer-tree-layer id="extra_security20170921130834191" source="./extra_security.shp" legend_exp="" name="extra_security" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" providerKey="delimitedtext" id="marshals_by_position20161003112326575" legend_split_behavior="0" checked="Qt::Unchecked" name="marshals_by_position">
+      <layer-tree-layer id="marshals_by_position20161003112326575" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" name="marshals_by_position" expanded="1" patch_size="0,0" providerKey="delimitedtext" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="marshals_by_position"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_split_behavior="0" checked="Qt::Unchecked" name="complete_marshal_overview">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" name="complete_marshal_overview" expanded="1" patch_size="0,0" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_split_behavior="0" checked="Qt::Unchecked" name="marshal_overviews">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" name="marshal_overviews" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option type="QString" name="legend/expressionFilter" value=""/>
+            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="">
+    <layer-tree-group name="Fencing and Cones" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" name="fencing">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" name="cached_name" type="QString"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option type="QString" name="cached_name" value="fencing"/>
+            <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+            <Option type="QString" name="legend/expressionFilter" value=""/>
+            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" providerKey="virtual" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" legend_split_behavior="0" checked="Qt::Unchecked" name="fence_groups">
+      <layer-tree-layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" name="fence_groups" expanded="1" patch_size="0,0" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" checked="Qt::Checked" name="Markers" groupLayer="">
+      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer patch_size="-1,-1" expanded="1" 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=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(4,0)&amp;uid={a8c77adf-5243-4314-9a93-cf23b20dbc65}" legend_exp="" providerKey="memory" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" legend_split_behavior="0" checked="Qt::Checked" name="route_markers">
+        <layer-tree-layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" source="Point?crs=EPSG:4326&amp;uid={2bd4c115-aee9-42aa-af5c-425618621c58}" legend_exp="" name="route_markers" expanded="1" patch_size="-1,-1" providerKey="memory" checked="Qt::Checked" legend_split_behavior="0">
           <customproperties>
             <Option type="Map">
-              <Option value="1" name="showFeatureCount" type="int"/>
+              <Option type="int" name="showFeatureCount" value="1"/>
+            </Option>
+          </customproperties>
+        </layer-tree-layer>
+        <layer-tree-layer id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" source="Point?crs=EPSG:4326&amp;uid={40e6cb9e-7c5b-40c3-b431-03ac2c4bba96}" legend_exp="" name="route_markers" expanded="1" patch_size="-1,-1" providerKey="memory" checked="Qt::Unchecked" legend_split_behavior="0">
+          <customproperties>
+            <Option type="Map">
+              <Option type="int" name="showFeatureCount" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="0" name="showFeatureCount" type="int"/>
+            <Option type="QString" name="cached_name" value="all_routes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="int" name="showFeatureCount" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer patch_size="0,0" expanded="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' " legend_exp="" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_split_behavior="0" checked="Qt::Unchecked" name="timelapse">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " legend_exp="" name="timelapse" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
       <customproperties>
         <Option type="Map">
-          <Option value="timelapse" name="cached_name" type="QString"/>
+          <Option type="QString" name="cached_name" value="timelapse"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Feeding Stations" groupLayer="">
+    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./water_tables.shp" legend_exp="" providerKey="ogr" id="water_tables20170921142016467" legend_split_behavior="0" checked="Qt::Checked" name="water_tables">
+      <layer-tree-layer id="water_tables20170921142016467" source="./water_tables.shp" legend_exp="" name="water_tables" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="QString" name="cached_name" value="water_tables"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Ask Me" groupLayer="">
+    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" checked="Qt::Unchecked" name="poi_labels">
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" source="./poi_labels.shp|layername=poi_labels" legend_exp="" name="poi_labels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="poi_labels" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="poi_labels"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" checked="Qt::Unchecked" name="directions_to_start">
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" name="directions_to_start" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="directions_to_start" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="directions_to_start"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Residents Access" groupLayer="">
+    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./mayor.shp" legend_exp="" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_split_behavior="0" checked="Qt::Unchecked" name="mayor">
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" source="./mayor.shp" legend_exp="" name="mayor" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="mayor" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="mayor"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./viplabels.shp" legend_exp="" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_split_behavior="0" checked="Qt::Checked" name="viplabels">
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" source="./viplabels.shp" legend_exp="" name="viplabels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="viplabels" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="viplabels"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./vipaccess.shp" legend_exp="" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_split_behavior="0" checked="Qt::Checked" name="vipaccess">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" source="./vipaccess.shp" legend_exp="" name="vipaccess" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="vipaccess" name="cached_name" type="QString"/>
+            <Option type="QString" name="cached_name" value="vipaccess"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="0" source="./golfaccess.shp" legend_exp="" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_split_behavior="0" checked="Qt::Unchecked" name="golfaccess">
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" source="./golfaccess.shp" legend_exp="" name="golfaccess" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" checked="Qt::Unchecked" name="residents_access_roads">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" name="residents_access_roads" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="residents_access_roads" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="QString" name="cached_name" value="residents_access_roads"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./residents_access.shp|layername=residents_access" legend_exp="" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_split_behavior="0" checked="Qt::Unchecked" name="residents_access">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" source="./residents_access.shp|layername=residents_access" legend_exp="" name="residents_access" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="OSM data" groupLayer="">
+    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="0" source="./osm_roads.shp" legend_exp="" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_split_behavior="0" checked="Qt::Checked" name="osm_roads">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" source="./osm_roads.shp" legend_exp="" name="osm_roads" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option type="QString" name="cached_name" value="osm_roads [3887]"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./osm_places.shp|layername=osm_places" legend_exp="" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_split_behavior="0" checked="Qt::Checked" name="osm_places">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" source="./osm_places.shp|layername=osm_places" legend_exp="" name="osm_places" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option type="QString" name="cached_name" value="osm_places [7]"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Start and Finish pages" groupLayer="">
+    <layer-tree-group name="Start and Finish pages" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./data-comments.shp" legend_exp="" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_split_behavior="0" checked="Qt::Unchecked" name="data-comments">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" source="./data-comments.shp" legend_exp="" name="data-comments" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./start_finish_area.shp" legend_exp="" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_split_behavior="0" checked="Qt::Unchecked" name="start_finish_area">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" source="./start_finish_area.shp" legend_exp="" name="start_finish_area" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Elevation" groupLayer="">
+    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="1" source="./capetownelevation-1m.shp" legend_exp="" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_split_behavior="0" checked="Qt::Unchecked" name="capetownelevation-1m">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" source="./capetownelevation-1m.shp" legend_exp="" name="capetownelevation-1m" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Map" groupLayer="">
+    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_split_behavior="0" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" patch_size="0,0" providerKey="gdal" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="QString" name="cached_name" value="GDAL-City of Cape Town 2015 Aerial"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" expanded="1" 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" legend_exp="" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_split_behavior="0" checked="Qt::Checked" name="Outlines">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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" legend_exp="" name="Outlines" expanded="1" patch_size="0,0" providerKey="wms" checked="Qt::Checked" legend_split_behavior="0">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" name="cached_name" type="QString"/>
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="QString" name="cached_name" value="Outlines"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -292,34 +299,36 @@
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
-      <item>route_markers_6943d827_bf32_40af_988d_60a736c1d3e1</item>
+      <item>route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7</item>
+      <item>route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings self-snapping="1" tolerance="10" maxScale="0" intersection-snapping="1" enabled="0" mode="3" type="1" scaleDependencyMode="0" minScale="0" unit="1">
+  <snapping-settings tolerance="10" mode="3" type="1" scaleDependencyMode="0" unit="1" minScale="0" intersection-snapping="1" maxScale="0" enabled="0" self-snapping="1">
     <individual-layer-settings>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0" type="1" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0" type="1" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0" type="1" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0" type="1" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" enabled="0" type="0" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="0" maxScale="0" units="2" id="extra_security20170921130834191" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="20" maxScale="0" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" type="2" minScale="0"/>
-      <layer-setting tolerance="0" maxScale="0" units="2" id="water_tables20170921142016467" enabled="0" type="2" minScale="0"/>
-      <layer-setting tolerance="12" maxScale="0" units="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="extra_security20170921130834191" tolerance="0" type="2" units="2" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" units="1" minScale="0" maxScale="0" enabled="1"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" tolerance="12" type="0" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" tolerance="12" type="0" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="water_tables20170921142016467" tolerance="0" type="2" units="2" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -327,10 +336,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.39819585919646983</xmin>
-      <ymin>-33.90642284955147545</ymin>
-      <xmax>18.39933053886358749</xmax>
-      <ymax>-33.90508771997006932</ymax>
+      <xmin>18.35711011631522638</xmin>
+      <ymin>-33.95802701381087729</ymin>
+      <xmax>18.43083771939430449</xmax>
+      <ymax>-33.87127486098422935</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -351,161 +360,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" checked="Qt::Checked" name="Marshals">
-      <legendlayer open="true" showFeatureCount="1" drawingOrder="-1" checked="Qt::Checked" name="marshal_positions">
+    <legendgroup name="Marshals" open="true" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" name="marshal_positions" open="true" showFeatureCount="1" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="extra_security">
+      <legendlayer drawingOrder="-1" name="extra_security" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="extra_security20170921130834191" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="marshals_by_position">
+      <legendlayer drawingOrder="-1" name="marshals_by_position" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="marshals_by_position20161003112326575" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="complete_marshal_overview">
+      <legendlayer drawingOrder="-1" name="complete_marshal_overview" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="marshal_overviews">
+      <legendlayer drawingOrder="-1" name="marshal_overviews" open="false" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Fencing and Cones">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="fencing">
+    <legendgroup name="Fencing and Cones" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="fencing" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="fence_groups">
+      <legendlayer drawingOrder="-1" name="fence_groups" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Routes">
-      <legendgroup open="true" checked="Qt::Checked" name="Markers">
-        <legendlayer open="true" showFeatureCount="1" drawingOrder="-1" checked="Qt::Checked" name="route_markers">
+    <legendgroup name="Routes" open="true" checked="Qt::Checked">
+      <legendgroup name="Markers" open="true" checked="Qt::Checked">
+        <legendlayer drawingOrder="-1" name="route_markers" open="true" showFeatureCount="1" checked="Qt::Checked">
           <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" layerid="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" isInOverview="0"/>
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+          </filegroup>
+        </legendlayer>
+        <legendlayer drawingOrder="-1" name="route_markers" open="true" showFeatureCount="1" checked="Qt::Unchecked">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="all_routes">
+      <legendlayer drawingOrder="-1" name="all_routes" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="timelapse">
+    <legendlayer drawingOrder="-1" name="timelapse" open="false" showFeatureCount="0" checked="Qt::Unchecked">
       <filegroup open="false" hidden="false">
-        <legendlayerfile visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0"/>
+        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" checked="Qt::Unchecked" name="Feeding Stations">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="water_tables">
+    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="water_tables" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="water_tables20170921142016467" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="poi_labels">
+    <legendgroup name="Ask Me" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="poi_labels" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="directions_to_start">
+      <legendlayer drawingOrder="-1" name="directions_to_start" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="mayor">
+    <legendgroup name="Residents Access" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="mayor" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="viplabels">
+      <legendlayer drawingOrder="-1" name="viplabels" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="vipaccess">
+      <legendlayer drawingOrder="-1" name="vipaccess" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="golfaccess">
+      <legendlayer drawingOrder="-1" name="golfaccess" open="false" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="residents_access_roads">
+      <legendlayer drawingOrder="-1" name="residents_access_roads" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="residents_access">
+      <legendlayer drawingOrder="-1" name="residents_access" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
-      <legendlayer open="false" showFeatureCount="1" drawingOrder="-1" checked="Qt::Checked" name="osm_roads">
+    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" name="osm_roads" open="false" showFeatureCount="1" checked="Qt::Checked">
         <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="1" drawingOrder="-1" checked="Qt::Checked" name="osm_places">
+      <legendlayer drawingOrder="-1" name="osm_places" open="true" showFeatureCount="1" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Start and Finish pages">
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="data-comments">
+    <legendgroup name="Start and Finish pages" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="data-comments" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Unchecked" name="start_finish_area">
+      <legendlayer drawingOrder="-1" name="start_finish_area" open="true" showFeatureCount="0" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
-      <legendlayer open="true" showFeatureCount="1" drawingOrder="-1" checked="Qt::Unchecked" name="capetownelevation-1m">
+    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
+      <legendlayer drawingOrder="-1" name="capetownelevation-1m" open="true" showFeatureCount="1" checked="Qt::Unchecked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Checked" name="Map">
-      <legendlayer open="false" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial">
+    <legendgroup name="Map" open="true" checked="Qt::Checked">
+      <legendlayer drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" open="false" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" showFeatureCount="0" drawingOrder="-1" checked="Qt::Checked" name="Outlines">
+      <legendlayer drawingOrder="-1" name="Outlines" open="true" showFeatureCount="0" checked="Qt::Checked">
         <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="annotation" refreshOnNotifyEnabled="0">
+  <main-annotation-layer type="annotation" autoRefreshTime="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" autoRefreshEnabled="0" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -556,7 +570,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer maxScale="100000" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" minScale="1e+08">
+    <maplayer type="raster" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" minScale="1e+08" autoRefreshEnabled="0" maxScale="100000" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -621,7 +635,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -646,58 +660,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" enabled="0" symbology="Line" zscale="1">
+      <elevation band="1" zoffset="0" enabled="0" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="152,125,183,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="152,125,183,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -728,36 +742,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="152,125,183,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -772,9 +786,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -783,27 +797,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="false" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Value" name="identify/format" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="WMSBackgroundLayer" value="false"/>
+          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="QString" name="identify/format" value="Value"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
           <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer greenBand="2" blueBand="3" type="multibandcolor" nodataColor="" opacity="0.5" redBand="1" alphaBand="-1">
+        <rasterrenderer opacity="0.5" alphaBand="-1" type="multibandcolor" nodataColor="" blueBand="3" greenBand="2" redBand="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -814,14 +828,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255"/>
+        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
+        <huesaturation colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeBlue="128" colorizeRed="255" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="0" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" minScale="1e+08">
+    <maplayer type="raster" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" minScale="1e+08" autoRefreshEnabled="0" maxScale="0" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -886,7 +900,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -909,58 +923,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal fetchMode="0" mode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" enabled="0" symbology="Line" zscale="1">
+      <elevation band="1" zoffset="0" enabled="0" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="225,89,137,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="225,89,137,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -991,36 +1005,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1035,9 +1049,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1046,27 +1060,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="no_action" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="true" name="WMSBackgroundLayer" type="QString"/>
-          <Option value="false" name="WMSPublishDataSourceUrl" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="Undefined" name="identify/format" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="WMSBackgroundLayer" value="true"/>
+          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="QString" name="identify/format" value="Undefined"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" name="name" type="QString"/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option value="collection" name="type" type="QString"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
           <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer band="1" type="singlebandcolordata" nodataColor="" opacity="0.75" alphaBand="-1">
+        <rasterrenderer opacity="0.75" alphaBand="-1" type="singlebandcolordata" nodataColor="" band="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1077,25 +1091,25 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255"/>
+        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
+        <huesaturation colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeBlue="128" colorizeRed="255" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
-        <ymax>-33.89943083574347327</ymax>
+        <ymax>-33.89943829535213382</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
-        <ymax>-33.89943083574347327</ymax>
+        <ymax>-33.89943829535213382</ymax>
       </wgs84extent>
       <id>all_routes_5833accf_77da_42ef_a24a_197208cd2190</id>
       <datasource>./all_routes.shp|layername=all_routes</datasource>
@@ -1149,7 +1163,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1163,8 +1177,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="integer" precision="0" length="6" comment="" expression="$length" subType="0" name="length_m" type="2"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="$length / 1000" subType="0" name="length_km" type="6"/>
+        <field length="-1" expression="$length * 100" precision="0" comment="" type="6" name="length_km" subType="0" typeName="double precision"/>
+        <field length="-1" expression="$length * 100 * 1000" precision="0" comment="" type="6" name="length_m" subType="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1177,58 +1191,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="RouteLen" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="RouteLen" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="229,182,54,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="229,182,54,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1259,36 +1273,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,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="164,130,39,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="164,130,39,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1303,44 +1317,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,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="164,130,39,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="164,130,39,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1363,53 +1377,59 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" checkstate="0" label="Active Routes">
-            <rule symbol="1" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" checkstate="0" label="21KM"/>
-            <rule symbol="2" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" checkstate="0" label="10KM"/>
-            <rule symbol="3" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" checkstate="0" label="5KM"/>
-            <rule symbol="4" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" checkstate="0" label="Trail"/>
+          <rule symbol="0" label="Active Routes" checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
+            <rule symbol="1" label="21KM" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
+            <rule symbol="2" label="10KM" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
+            <rule symbol="3" label="5KM" checkstate="0" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
+            <rule symbol="4" label="Trail" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
           </rule>
-          <rule symbol="5" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0" label="Always show"/>
-          <rule symbol="6" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show by day"/>
+          <rule symbol="5" label="Show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule symbol="6" label="21KM" 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 symbol="7" label="10KM" 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 symbol="8" label="5KM" checkstate="0" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule symbol="9" label="Trail" 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="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule symbol="11" label="Always show by day" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1429,44 +1449,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1482,32 +1502,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@0@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@0@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1522,15 +1542,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1538,35 +1558,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="MapUnit" 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="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1597,36 +1617,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1646,40 +1666,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1702,38 +1722,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1753,40 +1773,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1809,47 +1829,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <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" name="expression" type="QString"/>
-                          <Option value="3" name="type" type="int"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1869,44 +1889,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1922,32 +1942,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="210,32,39,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1962,15 +1982,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1978,35 +1998,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="MapUnit" 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="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="210,32,39,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2037,36 +2057,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2086,40 +2106,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2142,38 +2162,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2193,40 +2213,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2249,1378 +2269,58 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="10" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="500"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="250"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="Interval"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="103,34,144,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="name" v="filled_arrowhead"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MapUnit"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="103,34,144,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="227,26,28,0"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
-              <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="MapUnit" 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="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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>
-              <prop k="align_dash_pattern" v="0"/>
-              <prop k="capstyle" v="square"/>
-              <prop k="customdash" v="5;2"/>
-              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="customdash_unit" v="MapUnit"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="103,34,144,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="LastVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="103,34,144,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="FirstVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="103,34,144,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-          </symbol>
-          <symbol alpha="1" frame_rate="10" name="3" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="500"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="250"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="Interval"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@3@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="145,211,55,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="name" v="filled_arrowhead"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MapUnit"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@3@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="145,211,55,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="145,211,55,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="227,26,28,0"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
-              <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="MapUnit" 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="145,211,55,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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>
-              <prop k="align_dash_pattern" v="0"/>
-              <prop k="capstyle" v="square"/>
-              <prop k="customdash" v="5;2"/>
-              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="customdash_unit" v="MapUnit"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="145,211,55,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="LastVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@3@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="145,211,55,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="FirstVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@3@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="145,211,55,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="145,211,55,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-          </symbol>
-          <symbol alpha="1" frame_rate="10" name="4" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="250" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="RenderMetersInMapUnits" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="500"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="250"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="Interval"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@4@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_unit" type="QString"/>
-                    <Option value="diameter" name="scale_method" type="QString"/>
-                    <Option value="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="0,72,255,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="name" v="filled_arrowhead"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MapUnit"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@4@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,72,255,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="227,26,28,0" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="0,72,255,255"/>
-                      <prop k="joinstyle" v="bevel"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="227,26,28,0"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="0"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
-              <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="MapUnit" 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="0,72,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.5" 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="MapUnit" 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>
-              <prop k="align_dash_pattern" v="0"/>
-              <prop k="capstyle" v="square"/>
-              <prop k="customdash" v="5;2"/>
-              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="customdash_unit" v="MapUnit"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="0,72,255,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.5"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MapUnit"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="LastVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@4@2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="0,72,255,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="FirstVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
-              </Option>
-              <prop k="average_angle_length" v="4"/>
-              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="average_angle_unit" v="MM"/>
-              <prop k="interval" v="3"/>
-              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="interval_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_along_line" v="0"/>
-              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_along_line_unit" v="MM"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="place_on_every_part" v="true"/>
-              <prop k="placements" v="FirstVertex"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="rotate" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@4@3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
-                  <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,72,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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>
-                  <prop k="angle" v="0"/>
-                  <prop k="cap_style" v="square"/>
-                  <prop k="color" v="0,72,255,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="0,0,0,0"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-          </symbol>
-          <symbol alpha="1" frame_rate="10" name="5" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
-              <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="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3651,56 +2351,56 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="6" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="11" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.46" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.46"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3731,62 +2431,3582 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
+          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@2@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@3@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@3@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="145,211,55,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="145,211,55,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="145,211,55,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@3@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@3@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@4@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@4@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,72,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,72,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,72,255,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,72,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@4@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@4@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@5@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@5@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@5@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@5@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="6" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@6@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@6@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="210,32,39,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="210,32,39,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="210,32,39,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="210,32,39,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@6@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@6@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="210,32,39,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="7" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@7@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@7@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="103,34,144,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="103,34,144,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@7@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@7@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="103,34,144,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="8" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@8@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@8@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="145,211,55,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="145,211,55,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="145,211,55,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="145,211,55,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@8@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@8@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="145,211,55,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="145,211,55,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol type="line" alpha="1" name="9" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="250"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@9@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol type="fill" alpha="1" name="@@9@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,72,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,72,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,72,255,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.5"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,72,255,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.5"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@9@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="FirstVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <symbol type="marker" alpha="1" name="@9@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                  <Option type="Map">
+                    <Option type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,72,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="fillColor">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{4378179d-f926-41f4-9594-bdfa682c8a9f}">
-          <rule key="{573bc779-5c0e-4f9d-97f0-32cc9764b982}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes">
+        <rules key="{adefb6f1-8d28-439f-8c89-3617096e0e41}">
+          <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="{3d6b22ea-4051-4151-bae2-dc441215d183}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="round($length / 1000, 0)" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="round($length / 1000, 0)" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="164,113,88,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="164,113,88,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -3809,34 +6029,34 @@
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" 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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3851,98 +6071,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="km_marker()" quadOffset="3" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="LineGeometry" preserveRotation="1" geometryGeneratorEnabled="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="1" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="km_marker()" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="LineGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -3951,62 +6171,62 @@
       </labeling>
       <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="dualview/previewExpressions" type="List">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -4037,9 +6257,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4047,28 +6267,28 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4077,8 +6297,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4087,8 +6307,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4097,8 +6317,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4107,8 +6327,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4117,8 +6337,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4127,8 +6347,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4137,8 +6357,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -4157,68 +6377,68 @@
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
         <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_m" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </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_m" index="10" name=""/>
-        <alias field="length_km" index="11" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_km" name="" index="10"/>
+        <alias field="length_m" name="" index="11"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="Sort" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <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"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="descriptio" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="timestamp" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="begin" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="end" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Distance" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="RouteLen" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Source" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Sort" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_m" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_km" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" desc="" exp=""/>
@@ -4231,31 +6451,31 @@
         <constraint field="Source" desc="" exp=""/>
         <constraint field="Sort" desc="" exp=""/>
         <constraint field="day" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
         <constraint field="length_km" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="integer" precision="0" length="6" comment="" expression="$length" subType="0" name="length_m" type="2"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="$length / 1000" subType="0" name="length_km" type="6"/>
+        <field length="-1" expression="$length * 100" precision="0" comment="" type="6" name="length_km" subType="0" typeName="double precision"/>
+        <field length="-1" expression="$length * 100 * 1000" precision="0" comment="" type="6" name="length_m" subType="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Name&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;length_m&quot;">
         <columns>
-          <column hidden="0" name="Name" type="field" width="152"/>
-          <column hidden="0" name="descriptio" type="field" width="-1"/>
-          <column hidden="0" name="timestamp" type="field" width="-1"/>
-          <column hidden="0" name="begin" type="field" width="163"/>
-          <column hidden="0" name="end" type="field" width="-1"/>
-          <column hidden="0" name="Distance" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="RouteLen" type="field" width="-1"/>
-          <column hidden="0" name="Source" type="field" width="-1"/>
-          <column hidden="0" name="length_m" type="field" width="-1"/>
-          <column hidden="0" name="Sort" type="field" width="-1"/>
-          <column hidden="0" name="day" type="field" width="-1"/>
-          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column type="field" name="Name" width="152" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="163" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="188" hidden="0"/>
+          <column type="field" name="Sort" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="266" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4287,18 +6507,18 @@ def my_form_open(dialog, layer, feature):
       <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="end"/>
-        <field editable="0" name="length_km"/>
-        <field editable="0" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="0"/>
+        <field name="length_m" editable="0"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -4315,25 +6535,25 @@ def my_form_open(dialog, layer, feature):
         <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="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></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -4406,58 +6626,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="196,60,57,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="196,60,57,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4488,36 +6708,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,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="140,43,41,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="196,60,57,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="140,43,41,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -4532,44 +6752,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,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="140,43,41,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="196,60,57,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="140,43,41,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -4592,54 +6812,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="183,72,75,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="183,72,75,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4670,9 +6890,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4683,19 +6903,19 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="ID" configurationFlags="None">
@@ -4721,19 +6941,19 @@ 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 field="ID" name="" index="0"/>
+        <alias field="height" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="ID" expression=""/>
-        <default applyOnUpdate="0" field="height" expression=""/>
-        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default expression="" field="ID" applyOnUpdate="0"/>
+        <default expression="" field="height" applyOnUpdate="0"/>
+        <default expression="" field="elevation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="ID" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="height" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="elevation" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="ID" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="height" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="elevation" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="ID" desc="" exp=""/>
@@ -4744,7 +6964,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4767,18 +6987,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Polygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Polygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
-        <xmax>18.42424810950425851</xmax>
-        <ymax>-33.8965939968351222</ymax>
+        <xmax>18.42666503715575743</xmax>
+        <ymax>-33.89693315858618661</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
-        <xmax>18.42424810950425851</xmax>
-        <ymax>-33.8965939968351222</ymax>
+        <xmax>18.42666503715575743</xmax>
+        <ymax>-33.89693315858618661</ymax>
       </wgs84extent>
       <id>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews</datasource>
@@ -4842,58 +7062,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="133,182,111,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="133,182,111,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4924,36 +7144,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,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="95,130,79,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="95,130,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -4968,44 +7188,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,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="95,130,79,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="95,130,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -5028,38 +7248,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -5074,9 +7294,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5087,21 +7307,21 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -5134,22 +7354,22 @@ 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 field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="page" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="page" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="page" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="page" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="page" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -5161,7 +7381,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -5184,7 +7404,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5249,7 +7469,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5274,58 +7494,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="190,178,151,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="190,178,151,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5356,36 +7576,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,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="136,127,108,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="190,178,151,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,127,108,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -5400,44 +7620,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,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="136,127,108,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="190,178,151,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,127,108,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -5460,54 +7680,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,85,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,85,255,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5538,9 +7758,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5551,32 +7771,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="Name" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="Name" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -5591,116 +7811,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="2" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="LineGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="LineGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="Name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="Name"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -5731,9 +7951,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5741,20 +7961,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -5773,16 +7993,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="Name" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="Name" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -5792,11 +8012,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="Name" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5828,8 +8048,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="id"/>
+        <field name="Name" editable="1"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Name"/>
@@ -5841,7 +8061,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5906,7 +8126,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5931,58 +8151,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="145,82,45,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="145,82,45,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6013,36 +8233,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,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="104,59,32,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="145,82,45,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="104,59,32,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -6057,44 +8277,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,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="104,59,32,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="145,82,45,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="104,59,32,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -6117,48 +8337,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" label="21KM"/>
-          <rule symbol="1" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" label="10KM"/>
-          <rule symbol="2" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" label="5KM"/>
+          <rule symbol="0" label="21KM" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule symbol="1" label="10KM" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule symbol="2" label="5KM" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6178,40 +8398,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="miter" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" 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="210,32,39,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" 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="area" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="miter"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="210,32,39,255"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0.5"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="area"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -6234,32 +8454,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="100"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6279,44 +8499,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="210,32,39,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="210,32,39,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -6332,32 +8552,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@0@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@0@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="210,32,39,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="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="210,32,39,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -6372,9 +8592,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6382,35 +8602,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" 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="MapUnit" 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="miter" name="joinstyle" type="QString"/>
-                <Option value="210,32,39,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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="MapUnit" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="210,32,39,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -6441,39 +8661,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6493,44 +8713,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -6546,32 +8766,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" 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="103,34,144,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="miter"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="103,34,144,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.5"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -6586,9 +8806,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6596,24 +8816,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="100"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6633,44 +8853,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -6686,32 +8906,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,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="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -6726,9 +8946,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6736,35 +8956,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" 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="miter" name="joinstyle" type="QString"/>
-                <Option value="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -6795,39 +9015,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="500" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="500"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6847,44 +9067,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="69,100,25,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -6900,32 +9120,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@2@0@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,255" name="color" type="QString"/>
-                        <Option value="miter" 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="69,100,25,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.5" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="69,100,25,255"/>
+                        <Option type="QString" name="joinstyle" value="miter"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="69,100,25,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.5"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -6940,9 +9160,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6950,24 +9170,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="100" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_unit" type="QString"/>
-                <Option value="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="100"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6987,44 +9207,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="interval">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="offsetAlongLine">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="69,100,25,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="MapUnit" name="offset_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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="69,100,25,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MapUnit"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -7040,32 +9260,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@2@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@2@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="69,100,25,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="26,0,201,0" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="69,100,25,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -7080,9 +9300,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -7090,35 +9310,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" 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="MapUnit" 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="miter" name="joinstyle" type="QString"/>
-                <Option value="69,100,25,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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="MapUnit" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MapUnit"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="69,100,25,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MapUnit"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -7149,74 +9369,74 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <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 value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7247,9 +9467,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7257,20 +9477,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -7284,24 +9504,24 @@ 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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="Distance" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Distance" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -7311,11 +9531,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column hidden="0" name="Distance" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="id" type="field" width="-1"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7347,17 +9567,17 @@ def my_form_open(dialog, layer, feature):
       <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="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -7378,7 +9598,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7451,58 +9671,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="125,139,143,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="125,139,143,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7533,36 +9753,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,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="89,99,102,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="89,99,102,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -7577,44 +9797,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,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="89,99,102,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="89,99,102,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7637,46 +9857,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="0.796078" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="0.796078" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="227,0,185,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="0,0,0,0" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" 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="1" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="227,0,185,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,0"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="1"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7699,15 +9919,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7718,34 +9938,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )" 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 forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="8" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.4"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -7760,151 +9980,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Priority">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="8" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="1" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="1" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" 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 forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="227,0,185,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="4" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="227,0,185,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="4" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -7919,89 +10139,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="1" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="2"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -8010,194 +10230,194 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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 value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
+          <Option type="QString" name="labeling/angleOffset" value="0"/>
+          <Option type="QString" name="labeling/blendMode" value="0"/>
+          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
+          <Option type="QString" name="labeling/bufferColorA" value="255"/>
+          <Option type="QString" name="labeling/bufferColorB" value="255"/>
+          <Option type="QString" name="labeling/bufferColorG" value="255"/>
+          <Option type="QString" name="labeling/bufferColorR" value="255"/>
+          <Option type="QString" name="labeling/bufferDraw" value="false"/>
+          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
+          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
+          <Option type="QString" name="labeling/bufferSize" value="1"/>
+          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/bufferTransp" value="0"/>
+          <Option type="QString" name="labeling/centroidInside" value="false"/>
+          <Option type="QString" name="labeling/centroidWhole" value="false"/>
+          <Option type="QString" name="labeling/decimals" value="3"/>
+          <Option type="QString" name="labeling/displayAll" value="false"/>
+          <Option type="QString" name="labeling/dist" value="0"/>
+          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/drawLabels" value="false"/>
+          <Option type="QString" name="labeling/enabled" value="false"/>
+          <Option type="QString" name="labeling/fieldName" value="position"/>
+          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
+          <Option type="QString" name="labeling/fontCapitals" value="0"/>
+          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
+          <Option type="QString" name="labeling/fontItalic" value="false"/>
+          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
+          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
+          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
+          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
+          <Option type="QString" name="labeling/fontSize" value="10"/>
+          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
+          <Option type="QString" name="labeling/fontUnderline" value="false"/>
+          <Option type="QString" name="labeling/fontWeight" value="63"/>
+          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
+          <Option type="QString" name="labeling/formatNumbers" value="false"/>
+          <Option type="QString" name="labeling/isExpression" value="false"/>
+          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
+          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/labelPerPart" value="false"/>
+          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
+          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
+          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
+          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
+          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
+          <Option type="QString" name="labeling/mergeLines" value="false"/>
+          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
+          <Option type="QString" name="labeling/multilineAlign" value="0"/>
+          <Option type="QString" name="labeling/multilineHeight" value="1"/>
+          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
+          <Option type="QString" name="labeling/obstacle" value="true"/>
+          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
+          <Option type="QString" name="labeling/obstacleType" value="0"/>
+          <Option type="QString" name="labeling/offsetType" value="0"/>
+          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
+          <Option type="QString" name="labeling/placement" value="0"/>
+          <Option type="QString" name="labeling/placementFlags" value="10"/>
+          <Option type="QString" name="labeling/plussign" value="false"/>
+          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option type="QString" name="labeling/preserveRotation" value="true"/>
+          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
+          <Option type="QString" name="labeling/priority" value="5"/>
+          <Option type="QString" name="labeling/quadOffset" value="4"/>
+          <Option type="QString" name="labeling/repeatDistance" value="0"/>
+          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
+          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
+          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
+          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
+          <Option type="QString" name="labeling/scaleMin" value="1"/>
+          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
+          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
+          <Option type="QString" name="labeling/shadowColorB" value="0"/>
+          <Option type="QString" name="labeling/shadowColorG" value="0"/>
+          <Option type="QString" name="labeling/shadowColorR" value="0"/>
+          <Option type="QString" name="labeling/shadowDraw" value="false"/>
+          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
+          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
+          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
+          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
+          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
+          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
+          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
+          <Option type="QString" name="labeling/shadowScale" value="100"/>
+          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
+          <Option type="QString" name="labeling/shadowUnder" value="0"/>
+          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
+          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
+          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
+          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeDraw" value="true"/>
+          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
+          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
+          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
+          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
+          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
+          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
+          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
+          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
+          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
+          <Option type="QString" name="labeling/shapeRotation" value="0"/>
+          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
+          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
+          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
+          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
+          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
+          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
+          <Option type="QString" name="labeling/shapeType" value="0"/>
+          <Option type="QString" name="labeling/textColorA" value="255"/>
+          <Option type="QString" name="labeling/textColorB" value="255"/>
+          <Option type="QString" name="labeling/textColorG" value="255"/>
+          <Option type="QString" name="labeling/textColorR" value="255"/>
+          <Option type="QString" name="labeling/textTransp" value="0"/>
+          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
+          <Option type="QString" name="labeling/wrapChar" value=""/>
+          <Option type="QString" name="labeling/xOffset" value="0"/>
+          <Option type="QString" name="labeling/yOffset" value="0"/>
+          <Option type="QString" name="labeling/zIndex" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -8228,9 +10448,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8238,28 +10458,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="10" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="10" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -8268,8 +10488,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -8278,27 +10498,27 @@ 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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" 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 field="id" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="position" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -8309,12 +10529,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="position" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="position" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8390,7 +10610,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Polygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Polygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8465,58 +10685,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="164,113,88,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="164,113,88,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8547,36 +10767,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,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="117,81,63,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="164,113,88,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="117,81,63,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -8591,44 +10811,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,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="117,81,63,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="164,113,88,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="117,81,63,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8651,38 +10871,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,85,0,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="0,85,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,85,0,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,85,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="b_diagonal"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -8697,9 +10917,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8710,60 +10930,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="name"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -8794,9 +11014,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8804,20 +11024,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="1" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="name" configurationFlags="None">
@@ -8857,25 +11077,25 @@ 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="cone_len" index="3" name=""/>
-        <alias field="fence_len" index="4" name=""/>
+        <alias field="name" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="cone_len" name="" index="3"/>
+        <alias field="fence_len" name="" index="4"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="group" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="cone_len" expression=""/>
-        <default applyOnUpdate="0" field="fence_len" expression=""/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="group" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="cone_len" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="fence_len" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="group" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="cone_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="fence_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="name" desc="" exp=""/>
@@ -8888,14 +11108,14 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="name" type="field" width="-1"/>
-          <column hidden="0" name="group" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="cone_len" type="field" width="-1"/>
-          <column hidden="0" name="fence_len" type="field" width="-1"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="group" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="cone_len" width="-1" hidden="0"/>
+          <column type="field" name="fence_len" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8927,8 +11147,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="group"/>
@@ -8940,7 +11160,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -9005,7 +11225,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -9019,26 +11239,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" name="fence_len" type="6"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" name="fence_len" type="6"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" name="cone_len" type="6"/>
+        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis version="3.8.3-Zanzibar" maxScale="0" simplifyDrawingTol="1" simplifyAlgorithm="0" simplifyLocal="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" readOnly="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" minScale="1e+08">
+          <qgis labelsEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyLocal="1" readOnly="0" simplifyMaxScale="1" minScale="1e+08" maxScale="0" simplifyDrawingHints="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" forceraster="0" type="RuleRenderer" enableorderby="0">
+            <renderer-v2 type="RuleRenderer" symbollevels="1" enableorderby="0" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible"/>
+                <rule symbol="0" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol alpha="1" name="0" clip_to_extent="1" force_rhr="0" type="line">
-                  <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                <symbol alpha="1" type="line" name="0" clip_to_extent="1" force_rhr="0">
+                  <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                     <prop k="capstyle" v="square"/>
                     <prop k="customdash" v="5;2"/>
                     <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9057,9 +11277,9 @@ def my_form_open(dialog, layer, feature):
                     <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -9068,64 +11288,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fieldName="comment" fontWeight="50" fontLetterSpacing="0" fontCapitals="0" namedStyle="Regular" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" fontStrikeout="0" fontSize="11" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOpacity="0.8" fontSizeUnit="Point" isExpression="0" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontUnderline="0">
-                      <text-buffer bufferDraw="0" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-                      <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.6" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM"/>
-                      <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                    <text-style textColor="0,0,0,255" fontUnderline="0" fontCapitals="0" blendMode="0" fieldName="comment" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="#ffffff" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" isExpression="0" textOpacity="0.8" fontStrikeout="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point">
+                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+                      <background shapeType="0" shapeBlendMode="0" shapeBorderWidth="0.6" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.6" shapeOffsetX="0"/>
+                      <shadow shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" reverseDirectionSymbol="0" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1"/>
-                    <placement offsetUnits="MM" maxCurvedCharAngleIn="25" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" placementFlags="2" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistance="0" centroidInside="0" yOffset="0" placement="4" priority="5" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetType="0" rotationAngle="0" xOffset="0" dist="5" distUnits="MM" centroidWhole="0"/>
-                    <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="1" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" displayAll="1" zIndex="0"/>
+                    <text-format leftDirectionSymbol="&lt;" addDirectionSymbol="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" priority="5" distUnits="MM" dist="5" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" offsetUnits="MM" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" fitInPolygonOnly="0" centroidWhole="0" placement="4" placementFlags="2" xOffset="0" centroidInside="0" rotationAngle="0" geometryGenerator="" geometryGeneratorType="PointGeometry" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                    <rendering displayAll="1" scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" 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 type="QString" name="name" value=""/>
+                        <Option type="Map" name="properties">
+                          <Option type="Map" name="PositionX">
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                            <Option type="int" name="type" value="2"/>
                           </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 type="Map" name="PositionY">
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fieldName="round( $length, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" fontCapitals="0" namedStyle="Semibold" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOpacity="1" fontSizeUnit="Point" isExpression="1" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontUnderline="0">
-                      <text-buffer bufferDraw="1" bufferBlendMode="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-                      <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM"/>
-                      <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                    <text-style textColor="0,0,0,255" fontUnderline="0" fontCapitals="0" blendMode="0" fieldName="round( $length, 1) || 'm'" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="#ffffff" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" isExpression="1" textOpacity="1" fontStrikeout="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point">
+                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+                      <background shapeType="0" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0"/>
+                      <shadow shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" addDirectionSymbol="0" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" reverseDirectionSymbol="0" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1"/>
-                    <placement offsetUnits="MM" maxCurvedCharAngleIn="25" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" placementFlags="15" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" repeatDistance="0" centroidInside="0" yOffset="0" placement="2" priority="5" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetType="0" rotationAngle="0" xOffset="0" dist="1" distUnits="MM" centroidWhole="0"/>
-                    <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" displayAll="0" zIndex="0"/>
+                    <text-format leftDirectionSymbol="&lt;" addDirectionSymbol="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" priority="5" distUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" offsetUnits="MM" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" fitInPolygonOnly="0" centroidWhole="0" placement="2" placementFlags="15" xOffset="0" centroidInside="0" rotationAngle="0" geometryGenerator="" geometryGeneratorType="PointGeometry" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                    <rendering displayAll="0" scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" 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 type="QString" name="name" value=""/>
+                        <Option type="Map" name="properties">
+                          <Option type="Map" name="PositionX">
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                            <Option type="int" name="type" value="2"/>
                           </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 type="Map" name="PositionY">
+                            <Option type="bool" name="active" value="true"/>
+                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                            <Option type="int" name="type" value="2"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -9141,22 +11361,22 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory scaleBasedVisibility="0" backgroundColor="#ffffff" lineSizeType="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" minScaleDenominator="0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" penWidth="0" penAlpha="255">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory sizeType="MM" opacity="1" diagramOrientation="Up" backgroundAlpha="255" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" lineSizeType="MM" enabled="0" penAlpha="255" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" rotationOffset="270" minimumSize="0" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" barWidth="5" penWidth="0">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
                 <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+            <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" dist="0" placement="2">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -9240,45 +11460,45 @@ 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 field="id" name="" index="0"/>
+              <alias field="group" name="" index="1"/>
+              <alias field="comment" name="" index="2"/>
+              <alias field="moveable" name="" index="3"/>
+              <alias field="type" name="" index="4"/>
+              <alias field="name" name="" index="5"/>
+              <alias field="hidden" name="" index="6"/>
+              <alias field="auxiliary_storage_labeling_positiony" name="" index="7"/>
+              <alias field="auxiliary_storage_labeling_positionx" name="" index="8"/>
+              <alias field="fence_len" name="" index="9"/>
+              <alias field="cone_len" name="" index="10"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default applyOnUpdate="0" field="id" expression=""/>
-              <default applyOnUpdate="0" field="group" expression=""/>
-              <default applyOnUpdate="0" field="comment" expression=""/>
-              <default applyOnUpdate="0" field="moveable" expression=""/>
-              <default applyOnUpdate="0" field="type" expression=""/>
-              <default applyOnUpdate="0" field="name" expression=""/>
-              <default applyOnUpdate="0" field="hidden" expression=""/>
-              <default applyOnUpdate="0" field="auxiliary_storage_labeling_positiony" expression=""/>
-              <default applyOnUpdate="0" field="auxiliary_storage_labeling_positionx" expression=""/>
-              <default applyOnUpdate="0" field="fence_len" expression=""/>
-              <default applyOnUpdate="0" field="cone_len" expression=""/>
+              <default expression="" field="id" applyOnUpdate="0"/>
+              <default expression="" field="group" applyOnUpdate="0"/>
+              <default expression="" field="comment" applyOnUpdate="0"/>
+              <default expression="" field="moveable" applyOnUpdate="0"/>
+              <default expression="" field="type" applyOnUpdate="0"/>
+              <default expression="" field="name" applyOnUpdate="0"/>
+              <default expression="" field="hidden" applyOnUpdate="0"/>
+              <default expression="" field="auxiliary_storage_labeling_positiony" applyOnUpdate="0"/>
+              <default expression="" field="auxiliary_storage_labeling_positionx" applyOnUpdate="0"/>
+              <default expression="" field="fence_len" applyOnUpdate="0"/>
+              <default expression="" field="cone_len" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="group" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="comment" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="moveable" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="hidden" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="auxiliary_storage_labeling_positiony" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="auxiliary_storage_labeling_positionx" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="fence_len" notnull_strength="0" exp_strength="0" constraints="0"/>
-              <constraint unique_strength="0" field="cone_len" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="comment" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="moveable" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="hidden" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
               <constraint field="id" desc="" exp=""/>
@@ -9294,27 +11514,27 @@ def my_form_open(dialog, layer, feature):
               <constraint field="cone_len" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" name="fence_len" type="6"/>
-              <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" name="fence_len" type="6"/>
-              <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" name="cone_len" type="6"/>
+              <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
             </expressionfields>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
               <columns>
-                <column hidden="0" name="id" type="field" width="-1"/>
-                <column hidden="0" name="group" type="field" width="-1"/>
-                <column hidden="1" type="actions" width="-1"/>
-                <column hidden="0" name="comment" type="field" width="223"/>
-                <column hidden="0" name="moveable" type="field" width="-1"/>
-                <column hidden="0" name="type" type="field" width="-1"/>
-                <column hidden="0" name="name" type="field" width="414"/>
-                <column hidden="0" name="hidden" type="field" width="-1"/>
-                <column hidden="0" name="fence_len" type="field" width="-1"/>
-                <column hidden="0" name="cone_len" type="field" width="-1"/>
-                <column hidden="1" name="auxiliary_storage_labeling_positiony" type="field" width="-1"/>
-                <column hidden="1" name="auxiliary_storage_labeling_positionx" type="field" width="-1"/>
+                <column type="field" name="id" width="-1" hidden="0"/>
+                <column type="field" name="group" width="-1" hidden="0"/>
+                <column type="actions" width="-1" hidden="1"/>
+                <column type="field" name="comment" width="223" hidden="0"/>
+                <column type="field" name="moveable" width="-1" hidden="0"/>
+                <column type="field" name="type" width="-1" hidden="0"/>
+                <column type="field" name="name" width="414" hidden="0"/>
+                <column type="field" name="hidden" width="-1" hidden="0"/>
+                <column type="field" name="fence_len" width="-1" hidden="0"/>
+                <column type="field" name="cone_len" width="-1" hidden="0"/>
+                <column type="field" name="auxiliary_storage_labeling_positiony" width="-1" hidden="1"/>
+                <column type="field" name="auxiliary_storage_labeling_positionx" width="-1" hidden="1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -9345,18 +11565,18 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-              <field editable="1" name="comment"/>
-              <field editable="0" name="cone_len"/>
-              <field editable="0" name="fence_len"/>
-              <field editable="1" name="group"/>
-              <field editable="1" name="hidden"/>
-              <field editable="1" name="id"/>
-              <field editable="0" name="length"/>
-              <field editable="1" name="moveable"/>
-              <field editable="1" name="name"/>
-              <field editable="1" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+              <field name="comment" editable="1"/>
+              <field name="cone_len" editable="0"/>
+              <field name="fence_len" editable="0"/>
+              <field name="group" editable="1"/>
+              <field name="hidden" editable="1"/>
+              <field name="id" editable="1"/>
+              <field name="length" editable="0"/>
+              <field name="moveable" editable="1"/>
+              <field name="name" editable="1"/>
+              <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -9387,58 +11607,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="133,182,111,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="133,182,111,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9469,36 +11689,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="133,182,111,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="95,130,79,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="95,130,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -9513,44 +11733,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="133,182,111,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="95,130,79,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="95,130,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9573,64 +11793,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="1" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="1" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps">
-            <rule symbol="0" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones"/>
-            <rule symbol="1" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences"/>
-            <rule symbol="2" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences"/>
-            <rule symbol="3" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr')" checkstate="0" label="Construction"/>
+          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule symbol="3" label="Construction" checkstate="0" filter="regexp_match(&quot;type&quot;, '^constr')" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule symbol="4" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0" label="Is Visible"/>
+          <rule symbol="4" label="Is Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
           <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="1;4" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="Point" 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="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dot" name="line_style" type="QString"/>
-                <Option value="1" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="round"/>
+                <Option type="QString" name="customdash" value="1;4"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="Point"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="255,255,0,255"/>
+                <Option type="QString" name="line_style" value="dot"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -9661,56 +11881,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="round" name="capstyle" type="QString"/>
-                <Option value="4;3" 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="round" name="joinstyle" type="QString"/>
-                <Option value="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="round"/>
+                <Option type="QString" name="customdash" value="4;3"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="255,255,0,255"/>
+                <Option type="QString" name="line_style" value="dash"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -9741,56 +11961,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="255,255,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.8"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9821,56 +12041,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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')" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="3" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,0,255,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.8" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,0,255,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.8"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9901,56 +12121,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="4" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="255,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="255,255,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9981,50 +12201,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="5" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="213,180,60,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="213,180,60,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10055,9 +12275,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10066,34 +12286,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="comment" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="11" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.80000000000000004" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="comment" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.80000000000000004" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="0.59999999999999998" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,255" name="color" type="QString"/>
-                        <Option value="round" 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="255,255,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.6" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="255,255,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.6"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10108,110 +12328,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" 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 type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                        <Option type="int" name="type" value="2"/>
                       </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 type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="2" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="5" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="14" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1.8200000000000001" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="1" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="5" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1.8200000000000001" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" 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 type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                      <Option type="int" name="type" value="2"/>
                     </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 type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{226e1338-ed15-4fc8-a035-fefee03c38d6}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="round( $length, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="11" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="round( $length, 1) || 'm'" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10226,88 +12446,88 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="expression" value="1"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <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 type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                        <Option type="int" name="type" value="2"/>
                       </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 type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-25" priority="6" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="2" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="1" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="14" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="6" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="1"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <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 type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
+                      <Option type="int" name="type" value="2"/>
                     </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 type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -10316,60 +12536,60 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10400,9 +12620,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10410,20 +12630,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -10491,37 +12711,37 @@ 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="fence_len" index="7" name=""/>
-        <alias field="cone_len" index="8" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="comment" name="" index="2"/>
+        <alias field="moveable" name="" index="3"/>
+        <alias field="type" name="" index="4"/>
+        <alias field="name" name="" index="5"/>
+        <alias field="hidden" name="" index="6"/>
+        <alias field="fence_len" name="" index="7"/>
+        <alias field="cone_len" name="" index="8"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="group" expression=""/>
-        <default applyOnUpdate="0" field="comment" expression=""/>
-        <default applyOnUpdate="0" field="moveable" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="hidden" expression=""/>
-        <default applyOnUpdate="0" field="fence_len" expression=""/>
-        <default applyOnUpdate="0" field="cone_len" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="comment" applyOnUpdate="0"/>
+        <default expression="" field="moveable" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="hidden" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="group" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="comment" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="moveable" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="hidden" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="fence_len" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="cone_len" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="group" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="comment" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="moveable" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="hidden" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="fence_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="cone_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -10535,25 +12755,25 @@ def my_form_open(dialog, layer, feature):
         <constraint field="cone_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" name="fence_len" type="6"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" name="fence_len" type="6"/>
-        <field typeName="double precision" precision="0" length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" name="cone_len" type="6"/>
+        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
+        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="group" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="comment" type="field" width="373"/>
-          <column hidden="0" name="moveable" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="name" type="field" width="692"/>
-          <column hidden="0" name="hidden" type="field" width="-1"/>
-          <column hidden="0" name="fence_len" type="field" width="-1"/>
-          <column hidden="0" name="cone_len" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="group" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="comment" width="373" hidden="0"/>
+          <column type="field" name="moveable" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="name" width="692" hidden="0"/>
+          <column type="field" name="hidden" width="-1" hidden="0"/>
+          <column type="field" name="fence_len" width="-1" hidden="0"/>
+          <column type="field" name="cone_len" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10585,18 +12805,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="comment"/>
-        <field editable="0" name="cone_len"/>
-        <field editable="0" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="hidden"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="length"/>
-        <field editable="1" name="moveable"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="comment" editable="1"/>
+        <field name="cone_len" editable="0"/>
+        <field name="fence_len" editable="0"/>
+        <field name="group" editable="1"/>
+        <field name="hidden" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="length" editable="0"/>
+        <field name="moveable" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -10618,7 +12838,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10691,58 +12911,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="164,113,88,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="164,113,88,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10773,36 +12993,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="164,113,88,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="117,81,63,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="164,113,88,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="117,81,63,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -10817,44 +13037,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="164,113,88,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="117,81,63,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="164,113,88,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="117,81,63,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10877,54 +13097,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,178,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,178,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10955,9 +13175,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10968,60 +13188,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11052,9 +13272,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11062,20 +13282,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -11087,13 +13307,13 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias field="id" name="" index="0"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -11102,10 +13322,10 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11137,7 +13357,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
+        <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -11148,18 +13368,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiPolygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.95934132149262297</ymin>
-        <xmax>18.42432608246585701</xmax>
-        <ymax>-33.8965939968351222</ymax>
+        <ymin>-33.95871753779982782</ymin>
+        <xmax>18.42666503715575743</xmax>
+        <ymax>-33.89693315858618661</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.95934132149262297</ymin>
-        <xmax>18.42432608246585701</xmax>
-        <ymax>-33.8965939968351222</ymax>
+        <ymin>-33.95871753779982782</ymin>
+        <xmax>18.42666503715575743</xmax>
+        <ymax>-33.89693315858618661</ymax>
       </wgs84extent>
       <id>marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51</id>
       <datasource>./marshal overviews.shp|layername=marshal overviews</datasource>
@@ -11221,58 +13441,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="213,180,60,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="213,180,60,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11303,36 +13523,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="213,180,60,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="152,129,43,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="213,180,60,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="152,129,43,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -11347,44 +13567,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="213,180,60,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="152,129,43,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="213,180,60,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="152,129,43,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11407,38 +13627,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="26,0,201,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="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="dot" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="b_diagonal" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="26,0,201,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="dot"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="b_diagonal"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -11453,9 +13673,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11466,65 +13686,69 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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="dualview/previewExpressions" type="List">
-            <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <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" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11555,9 +13779,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11565,34 +13789,34 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option value="true" name="active" type="bool"/>
-                <Option value="id" name="field" type="QString"/>
-                <Option value="2" name="type" type="int"/>
+            <Option type="QString" name="name" value=""/>
+            <Option type="Map" name="properties">
+              <Option type="Map" name="show">
+                <Option type="bool" name="active" value="true"/>
+                <Option type="QString" name="field" value="id"/>
+                <Option type="int" name="type" value="2"/>
               </Option>
             </Option>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11601,8 +13825,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11611,8 +13835,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11626,22 +13850,22 @@ 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 field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="page" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="page" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="page" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="page" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="page" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -11653,13 +13877,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;page&quot;">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="day" type="field" width="-1"/>
-          <column hidden="0" name="page" type="field" width="-1"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="page" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11691,9 +13915,9 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="page"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="page" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -11706,7 +13930,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -11771,7 +13995,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11782,7 +14006,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join upsertOnEdit="0" memoryCache="0" cascadedDelete="0" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" editable="0" hasCustomPrefix="1" dynamicForm="0" customPrefix="csv_" joinFieldName="position">
+        <join cascadedDelete="0" joinFieldName="position" memoryCache="0" editable="0" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="0" customPrefix="csv_" hasCustomPrefix="1">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -11809,58 +14033,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="id" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="id" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="114,155,111,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="114,155,111,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11891,36 +14115,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,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="81,111,79,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="114,155,111,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="81,111,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -11935,44 +14159,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="114,155,111,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="81,111,79,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="114,155,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="81,111,79,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11995,51 +14219,51 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" label="Always show in marshal overview"/>
-          <rule symbol="1" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" label="Show in marshal overview"/>
-          <rule symbol="2" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" description="Show in marshal overview" checkstate="0" label="Show in marshal maps"/>
+          <rule symbol="0" label="Show by day in marshal plan" 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 symbol="1" label="Always show in marshal plan" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule symbol="2" label="Show in marshal maps" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" description="Show in marshal overview" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol alpha="0.792157" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="0.8" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="0,0,0,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="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="5"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="Pixel"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -12062,42 +14286,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="0.792157" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="0.8" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="0,0,0,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="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="5"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="Pixel"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -12120,42 +14344,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="0.01" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="0.01" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
+            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" 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="0.1" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="0.1"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -12178,9 +14402,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12188,43 +14412,43 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{8d8bf0e7-537f-4704-ade2-f0f6492cc7eb}">
-          <rule key="{2039cbe3-738a-42d9-9a8c-d8770eecca08}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+        <rules key="{a69c392f-7c45-4a75-a992-731572d96e04}">
+          <rule active="0" 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="{500cb2dd-2062-4b02-bba6-05c13c814f8b}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="6" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="231,113,72,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -12247,34 +14471,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12289,110 +14513,286 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="1" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="PointGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="2"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{47a8bd63-bf65-4c59-961d-6916df289a29}" 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">
+          <rule 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="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="6" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.5" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="231,113,72,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="231,113,72,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="255,255,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="0,0,0,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0.1"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <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="{a55220d0-6cca-4356-8b73-4d8675ee164b}">
+            <settings calloutType="simple">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.5" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <families/>
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.4"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12407,181 +14807,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="FontOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="FontOpacity">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="FontStyle" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Priority">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="ShapeOpacity">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                        <Option value="3" name="type" type="int"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                        <Option type="int" name="type" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="1" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="8" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1.8" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="5"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{d8764302-827c-43a5-be63-465b96e23498}" 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 inactive labels below active label">
+          <rule active="0" 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 inactive labels below active label" key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="6" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.59999999999999998" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.59999999999999998" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.4"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12596,181 +14996,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="FontOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="FontOpacity">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="Priority">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ShapeOpacity">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="1" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="8" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1.8" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="5"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{81445dc3-bc05-47bf-8749-b1306c7050f3}" 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">
+          <rule active="0" 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="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="position" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="8" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,0,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.90000000000000002" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,0,255" shapeOpacity="0.90000000000000002" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,0,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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.4" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,0,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.4"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -12785,149 +15185,149 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="false" name="active" type="bool"/>
-                              <Option value="1" name="type" type="int"/>
-                              <Option value="" name="val" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="false"/>
+                              <Option type="int" name="type" value="1"/>
+                              <Option type="QString" name="val" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="AlwaysShow">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="FontOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="FontOpacity">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="FontStyle" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="FontStyle">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ObstacleFactor">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Priority" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="Priority">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ShapeOpacity">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="Size" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="Size">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="ZIndex" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="ZIndex">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="1" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="1.8" minFeatureSize="0" obstacle="0" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="10"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="10" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="AlwaysShow">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="FontOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="FontStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="FontStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ObstacleFactor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Priority" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Priority">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ShapeOpacity">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="Size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="Size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="ZIndex" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="ZIndex">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -12936,200 +15336,202 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="dualview/previewExpressions" type="List">
-            <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <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" name="embeddedWidgets/count" type="QString"/>
-          <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/angleOffset" type="QString"/>
-          <Option value="0" name="labeling/blendMode" type="QString"/>
-          <Option value="0" name="labeling/bufferBlendMode" type="QString"/>
-          <Option value="255" name="labeling/bufferColorA" type="QString"/>
-          <Option value="255" name="labeling/bufferColorB" type="QString"/>
-          <Option value="255" name="labeling/bufferColorG" type="QString"/>
-          <Option value="255" name="labeling/bufferColorR" type="QString"/>
-          <Option value="false" name="labeling/bufferDraw" type="QString"/>
-          <Option value="64" name="labeling/bufferJoinStyle" type="QString"/>
-          <Option value="false" name="labeling/bufferNoFill" type="QString"/>
-          <Option value="1" name="labeling/bufferSize" type="QString"/>
-          <Option value="false" name="labeling/bufferSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/bufferTransp" type="QString"/>
-          <Option value="false" name="labeling/centroidInside" type="QString"/>
-          <Option value="false" name="labeling/centroidWhole" type="QString"/>
-          <Option value="3" name="labeling/decimals" type="QString"/>
-          <Option value="false" name="labeling/displayAll" type="QString"/>
-          <Option value="0" name="labeling/dist" type="QString"/>
-          <Option value="false" name="labeling/distInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/distMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/drawLabels" type="QString"/>
-          <Option value="false" name="labeling/enabled" type="QString"/>
-          <Option value="position" name="labeling/fieldName" type="QString"/>
-          <Option value="false" name="labeling/fitInPolygonOnly" type="QString"/>
-          <Option value="0" name="labeling/fontCapitals" type="QString"/>
-          <Option value="Myriad Pro" name="labeling/fontFamily" type="QString"/>
-          <Option value="false" name="labeling/fontItalic" type="QString"/>
-          <Option value="0" name="labeling/fontLetterSpacing" type="QString"/>
-          <Option value="false" name="labeling/fontLimitPixelSize" type="QString"/>
-          <Option value="10000" name="labeling/fontMaxPixelSize" type="QString"/>
-          <Option value="3" name="labeling/fontMinPixelSize" type="QString"/>
-          <Option value="10" name="labeling/fontSize" type="QString"/>
-          <Option value="false" name="labeling/fontSizeInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/fontStrikeout" type="QString"/>
-          <Option value="false" name="labeling/fontUnderline" type="QString"/>
-          <Option value="63" name="labeling/fontWeight" type="QString"/>
-          <Option value="0" name="labeling/fontWordSpacing" type="QString"/>
-          <Option value="false" name="labeling/formatNumbers" type="QString"/>
-          <Option value="false" name="labeling/isExpression" type="QString"/>
-          <Option value="true" name="labeling/labelOffsetInMapUnits" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale" type="QString"/>
-          <Option value="false" name="labeling/labelPerPart" type="QString"/>
-          <Option value="&lt;" name="labeling/leftDirectionSymbol" type="QString"/>
-          <Option value="false" name="labeling/limitNumLabels" type="QString"/>
-          <Option value="20" name="labeling/maxCurvedCharAngleIn" type="QString"/>
-          <Option value="-20" name="labeling/maxCurvedCharAngleOut" type="QString"/>
-          <Option value="2000" name="labeling/maxNumLabels" type="QString"/>
-          <Option value="false" name="labeling/mergeLines" type="QString"/>
-          <Option value="0" name="labeling/minFeatureSize" type="QString"/>
-          <Option value="0" name="labeling/multilineAlign" type="QString"/>
-          <Option value="1" name="labeling/multilineHeight" type="QString"/>
-          <Option value="Semibold" name="labeling/namedStyle" type="QString"/>
-          <Option value="true" name="labeling/obstacle" type="QString"/>
-          <Option value="1" name="labeling/obstacleFactor" type="QString"/>
-          <Option value="0" name="labeling/obstacleType" type="QString"/>
-          <Option value="0" name="labeling/offsetType" type="QString"/>
-          <Option value="0" name="labeling/placeDirectionSymbol" type="QString"/>
-          <Option value="0" name="labeling/placement" type="QString"/>
-          <Option value="10" name="labeling/placementFlags" type="QString"/>
-          <Option value="false" name="labeling/plussign" type="QString"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder" type="QString"/>
-          <Option value="true" name="labeling/preserveRotation" type="QString"/>
-          <Option value="#ffffff" name="labeling/previewBkgrdColor" type="QString"/>
-          <Option value="5" name="labeling/priority" type="QString"/>
-          <Option value="4" name="labeling/quadOffset" type="QString"/>
-          <Option value="0" name="labeling/repeatDistance" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/repeatDistanceUnit" type="QString"/>
-          <Option value="false" name="labeling/reverseDirectionSymbol" type="QString"/>
-          <Option value=">" name="labeling/rightDirectionSymbol" type="QString"/>
-          <Option value="10000000" name="labeling/scaleMax" type="QString"/>
-          <Option value="1" name="labeling/scaleMin" type="QString"/>
-          <Option value="false" name="labeling/scaleVisibility" type="QString"/>
-          <Option value="6" name="labeling/shadowBlendMode" type="QString"/>
-          <Option value="0" name="labeling/shadowColorB" type="QString"/>
-          <Option value="0" name="labeling/shadowColorG" type="QString"/>
-          <Option value="0" name="labeling/shadowColorR" type="QString"/>
-          <Option value="false" name="labeling/shadowDraw" type="QString"/>
-          <Option value="135" name="labeling/shadowOffsetAngle" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetDist" type="QString"/>
-          <Option value="true" name="labeling/shadowOffsetGlobal" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowOffsetUnits" type="QString"/>
-          <Option value="1.5" name="labeling/shadowRadius" type="QString"/>
-          <Option value="false" name="labeling/shadowRadiusAlphaOnly" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shadowRadiusUnits" type="QString"/>
-          <Option value="100" name="labeling/shadowScale" type="QString"/>
-          <Option value="30" name="labeling/shadowTransparency" type="QString"/>
-          <Option value="0" name="labeling/shadowUnder" type="QString"/>
-          <Option value="0" name="labeling/shapeBlendMode" type="QString"/>
-          <Option value="255" name="labeling/shapeBorderColorA" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorB" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorG" type="QString"/>
-          <Option value="128" name="labeling/shapeBorderColorR" type="QString"/>
-          <Option value="0" name="labeling/shapeBorderWidth" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeBorderWidthUnits" type="QString"/>
-          <Option value="true" name="labeling/shapeDraw" type="QString"/>
-          <Option value="255" name="labeling/shapeFillColorA" type="QString"/>
-          <Option value="138" name="labeling/shapeFillColorB" type="QString"/>
-          <Option value="0" name="labeling/shapeFillColorG" type="QString"/>
-          <Option value="101" name="labeling/shapeFillColorR" type="QString"/>
-          <Option value="64" name="labeling/shapeJoinStyle" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeOffsetUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetX" type="QString"/>
-          <Option value="0" name="labeling/shapeOffsetY" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale" type="QString"/>
-          <Option value="1" name="labeling/shapeRadiiUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiX" type="QString"/>
-          <Option value="0" name="labeling/shapeRadiiY" type="QString"/>
-          <Option value="0" name="labeling/shapeRotation" type="QString"/>
-          <Option value="0" name="labeling/shapeRotationType" type="QString"/>
-          <Option value="" name="labeling/shapeSVGFile" type="QString"/>
-          <Option value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeType" type="QString"/>
-          <Option value="1" name="labeling/shapeSizeUnits" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeX" type="QString"/>
-          <Option value="0" name="labeling/shapeSizeY" type="QString"/>
-          <Option value="0" name="labeling/shapeTransparency" type="QString"/>
-          <Option value="0" name="labeling/shapeType" type="QString"/>
-          <Option value="255" name="labeling/textColorA" type="QString"/>
-          <Option value="255" name="labeling/textColorB" type="QString"/>
-          <Option value="255" name="labeling/textColorG" type="QString"/>
-          <Option value="255" name="labeling/textColorR" type="QString"/>
-          <Option value="0" name="labeling/textTransp" type="QString"/>
-          <Option value="0" name="labeling/upsidedownLabels" type="QString"/>
-          <Option value="" name="labeling/wrapChar" type="QString"/>
-          <Option value="0" name="labeling/xOffset" type="QString"/>
-          <Option value="0" name="labeling/yOffset" type="QString"/>
-          <Option value="0" name="labeling/zIndex" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
+          <Option type="QString" name="labeling/angleOffset" value="0"/>
+          <Option type="QString" name="labeling/blendMode" value="0"/>
+          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
+          <Option type="QString" name="labeling/bufferColorA" value="255"/>
+          <Option type="QString" name="labeling/bufferColorB" value="255"/>
+          <Option type="QString" name="labeling/bufferColorG" value="255"/>
+          <Option type="QString" name="labeling/bufferColorR" value="255"/>
+          <Option type="QString" name="labeling/bufferDraw" value="false"/>
+          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
+          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
+          <Option type="QString" name="labeling/bufferSize" value="1"/>
+          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/bufferTransp" value="0"/>
+          <Option type="QString" name="labeling/centroidInside" value="false"/>
+          <Option type="QString" name="labeling/centroidWhole" value="false"/>
+          <Option type="QString" name="labeling/decimals" value="3"/>
+          <Option type="QString" name="labeling/displayAll" value="false"/>
+          <Option type="QString" name="labeling/dist" value="0"/>
+          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/drawLabels" value="false"/>
+          <Option type="QString" name="labeling/enabled" value="false"/>
+          <Option type="QString" name="labeling/fieldName" value="position"/>
+          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
+          <Option type="QString" name="labeling/fontCapitals" value="0"/>
+          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
+          <Option type="QString" name="labeling/fontItalic" value="false"/>
+          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
+          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
+          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
+          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
+          <Option type="QString" name="labeling/fontSize" value="10"/>
+          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
+          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
+          <Option type="QString" name="labeling/fontUnderline" value="false"/>
+          <Option type="QString" name="labeling/fontWeight" value="63"/>
+          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
+          <Option type="QString" name="labeling/formatNumbers" value="false"/>
+          <Option type="QString" name="labeling/isExpression" value="false"/>
+          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
+          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/labelPerPart" value="false"/>
+          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
+          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
+          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
+          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
+          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
+          <Option type="QString" name="labeling/mergeLines" value="false"/>
+          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
+          <Option type="QString" name="labeling/multilineAlign" value="0"/>
+          <Option type="QString" name="labeling/multilineHeight" value="1"/>
+          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
+          <Option type="QString" name="labeling/obstacle" value="true"/>
+          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
+          <Option type="QString" name="labeling/obstacleType" value="0"/>
+          <Option type="QString" name="labeling/offsetType" value="0"/>
+          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
+          <Option type="QString" name="labeling/placement" value="0"/>
+          <Option type="QString" name="labeling/placementFlags" value="10"/>
+          <Option type="QString" name="labeling/plussign" value="false"/>
+          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option type="QString" name="labeling/preserveRotation" value="true"/>
+          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
+          <Option type="QString" name="labeling/priority" value="5"/>
+          <Option type="QString" name="labeling/quadOffset" value="4"/>
+          <Option type="QString" name="labeling/repeatDistance" value="0"/>
+          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
+          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
+          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
+          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
+          <Option type="QString" name="labeling/scaleMin" value="1"/>
+          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
+          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
+          <Option type="QString" name="labeling/shadowColorB" value="0"/>
+          <Option type="QString" name="labeling/shadowColorG" value="0"/>
+          <Option type="QString" name="labeling/shadowColorR" value="0"/>
+          <Option type="QString" name="labeling/shadowDraw" value="false"/>
+          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
+          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
+          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
+          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
+          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
+          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
+          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
+          <Option type="QString" name="labeling/shadowScale" value="100"/>
+          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
+          <Option type="QString" name="labeling/shadowUnder" value="0"/>
+          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
+          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
+          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
+          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
+          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeDraw" value="true"/>
+          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
+          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
+          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
+          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
+          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
+          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
+          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
+          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
+          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
+          <Option type="QString" name="labeling/shapeRotation" value="0"/>
+          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
+          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
+          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
+          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
+          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
+          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
+          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
+          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
+          <Option type="QString" name="labeling/shapeType" value="0"/>
+          <Option type="QString" name="labeling/textColorA" value="255"/>
+          <Option type="QString" name="labeling/textColorB" value="255"/>
+          <Option type="QString" name="labeling/textColorG" value="255"/>
+          <Option type="QString" name="labeling/textColorR" value="255"/>
+          <Option type="QString" name="labeling/textTransp" value="0"/>
+          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
+          <Option type="QString" name="labeling/wrapChar" value=""/>
+          <Option type="QString" name="labeling/xOffset" value="0"/>
+          <Option type="QString" name="labeling/yOffset" value="0"/>
+          <Option type="QString" name="labeling/zIndex" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13160,9 +15562,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13170,28 +15572,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13200,8 +15602,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13210,8 +15612,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" name="IsMultiline" type="bool"/>
-                <Option value="false" name="UseHtml" type="bool"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -13220,8 +15622,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13230,8 +15632,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13254,8 +15656,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13304,52 +15706,52 @@ 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="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_position" index="6" name=""/>
-        <alias field="csv_club" index="7" name=""/>
-        <alias field="csv_firstname" index="8" name=""/>
-        <alias field="csv_surname" index="9" name=""/>
-        <alias field="csv_days" index="10" name=""/>
-        <alias field="csv_first_runner" index="11" name=""/>
-        <alias field="csv_last_runner" index="12" name=""/>
-        <alias field="csv_instructions" index="13" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="notes" name="" index="3"/>
+        <alias field="xyposition" name="" index="4"/>
+        <alias field="day" name="" index="5"/>
+        <alias field="csv_position" name="" index="6"/>
+        <alias field="csv_club" name="" index="7"/>
+        <alias field="csv_firstname" name="" index="8"/>
+        <alias field="csv_surname" name="" index="9"/>
+        <alias field="csv_days" name="" index="10"/>
+        <alias field="csv_first_runner" name="" index="11"/>
+        <alias field="csv_last_runner" name="" index="12"/>
+        <alias field="csv_instructions" name="" index="13"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="notes" expression=""/>
-        <default applyOnUpdate="0" field="xyposition" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="csv_position" expression=""/>
-        <default applyOnUpdate="0" field="csv_club" expression=""/>
-        <default applyOnUpdate="0" field="csv_firstname" expression=""/>
-        <default applyOnUpdate="0" field="csv_surname" expression=""/>
-        <default applyOnUpdate="0" field="csv_days" expression=""/>
-        <default applyOnUpdate="0" field="csv_first_runner" expression=""/>
-        <default applyOnUpdate="0" field="csv_last_runner" expression=""/>
-        <default applyOnUpdate="0" field="csv_instructions" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="notes" applyOnUpdate="0"/>
+        <default expression="" field="xyposition" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
+        <default expression="" field="csv_position" applyOnUpdate="0"/>
+        <default expression="" field="csv_club" applyOnUpdate="0"/>
+        <default expression="" field="csv_firstname" applyOnUpdate="0"/>
+        <default expression="" field="csv_surname" applyOnUpdate="0"/>
+        <default expression="" field="csv_days" applyOnUpdate="0"/>
+        <default expression="" field="csv_first_runner" applyOnUpdate="0"/>
+        <default expression="" field="csv_last_runner" applyOnUpdate="0"/>
+        <default expression="" field="csv_instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="position" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="notes" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="xyposition" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_position" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_club" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_firstname" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_surname" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_days" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_first_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_last_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="csv_instructions" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="notes" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="xyposition" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_club" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_firstname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_surname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_days" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_first_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_last_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="csv_instructions" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -13371,23 +15773,23 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;day&quot;" sortOrder="1">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="position" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="notes" type="field" width="-1"/>
-          <column hidden="0" name="xyposition" type="field" width="-1"/>
-          <column hidden="0" name="csv_club" type="field" width="-1"/>
-          <column hidden="0" name="csv_first_runner" type="field" width="-1"/>
-          <column hidden="0" name="csv_last_runner" type="field" width="-1"/>
-          <column hidden="0" name="csv_firstname" type="field" width="-1"/>
-          <column hidden="0" name="csv_surname" type="field" width="-1"/>
-          <column hidden="0" name="csv_position" type="field" width="-1"/>
-          <column hidden="0" name="csv_days" type="field" width="-1"/>
-          <column hidden="0" name="day" type="field" width="-1"/>
-          <column hidden="0" name="csv_instructions" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="position" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="notes" width="-1" hidden="0"/>
+          <column type="field" name="xyposition" width="-1" hidden="0"/>
+          <column type="field" name="csv_club" width="-1" hidden="0"/>
+          <column type="field" name="csv_first_runner" width="-1" hidden="0"/>
+          <column type="field" name="csv_last_runner" width="-1" hidden="0"/>
+          <column type="field" name="csv_firstname" width="-1" hidden="0"/>
+          <column type="field" name="csv_surname" width="-1" hidden="0"/>
+          <column type="field" name="csv_position" width="-1" hidden="0"/>
+          <column type="field" name="csv_days" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="csv_instructions" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13419,40 +15821,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="0" name="csv_10_distance"/>
-        <field editable="0" name="csv_21_distance"/>
-        <field editable="0" name="csv_Description"/>
-        <field editable="1" name="csv_capt_1"/>
-        <field editable="1" name="csv_captai"/>
-        <field editable="0" name="csv_captain"/>
-        <field editable="0" name="csv_captain_email"/>
-        <field editable="0" name="csv_captain_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_days"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <field name="csv_10_distance" editable="0"/>
+        <field name="csv_21_distance" editable="0"/>
+        <field name="csv_Description" editable="0"/>
+        <field name="csv_capt_1" editable="1"/>
+        <field name="csv_captai" editable="1"/>
+        <field name="csv_captain" editable="0"/>
+        <field name="csv_captain_email" editable="0"/>
+        <field name="csv_captain_number" editable="0"/>
+        <field name="csv_captain_phone" editable="0"/>
+        <field name="csv_club" editable="0"/>
+        <field name="csv_days" editable="0"/>
+        <field name="csv_email" editable="0"/>
+        <field name="csv_first runner" editable="0"/>
+        <field name="csv_first_" editable="1"/>
+        <field name="csv_first_runner" editable="0"/>
+        <field name="csv_firstname" editable="0"/>
+        <field name="csv_instru" editable="1"/>
+        <field name="csv_instructions" editable="0"/>
+        <field name="csv_last runner" editable="0"/>
+        <field name="csv_last_r" editable="1"/>
+        <field name="csv_last_runner" editable="0"/>
+        <field name="csv_name" editable="0"/>
+        <field name="csv_phone" editable="0"/>
+        <field name="csv_positi" editable="1"/>
+        <field name="csv_position" editable="0"/>
+        <field name="csv_races" editable="0"/>
+        <field name="csv_surname" editable="0"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="notes" editable="1"/>
+        <field name="oldpositio" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="csv_10_distance"/>
@@ -13491,27 +15893,27 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="xyposition"/>
       </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_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_races"/>
-        <field reuseLastValue="0" name="csv_surname"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <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_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_races" reuseLastValue="0"/>
+        <field name="csv_surname" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" 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>
@@ -13561,7 +15963,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="100000" styleCategories="AllStyleCategories" geometry="No geometry" refreshOnNotifyMessage="" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" autoRefreshTime="0" wkbType="NoGeometry" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" minScale="1e+08">
+    <maplayer geometry="No geometry" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" minScale="1e+08" autoRefreshEnabled="0" wkbType="NoGeometry" maxScale="100000" refreshOnNotifyMessage="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -13614,7 +16016,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13627,8 +16029,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="marshal_positions20160930121322287"/>
         <layer id="all_routes20170907054841602"/>
+        <layer id="marshal_positions20160930121322287"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -13642,58 +16044,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="243,166,178,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13724,36 +16126,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="243,166,178,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="174,119,127,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -13768,44 +16170,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="243,166,178,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="174,119,127,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13828,9 +16230,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13839,28 +16241,28 @@ 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 value="first_name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="first_name"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13869,8 +16271,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13893,8 +16295,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13903,8 +16305,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13913,8 +16315,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13923,8 +16325,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13954,8 +16356,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13983,55 +16385,55 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" index="0" name=""/>
-        <alias field="club" index="1" name=""/>
-        <alias field="firstname" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="name" 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="captain_email" index="9" name=""/>
-        <alias field="days" index="10" name=""/>
-        <alias field="races" index="11" name=""/>
-        <alias field="first_runner" index="12" name=""/>
-        <alias field="last_runner" index="13" name=""/>
-        <alias field="instructions" index="14" name=""/>
+        <alias field="position" name="" index="0"/>
+        <alias field="club" name="" index="1"/>
+        <alias field="firstname" name="" index="2"/>
+        <alias field="surname" name="" index="3"/>
+        <alias field="name" name="" index="4"/>
+        <alias field="phone" name="" index="5"/>
+        <alias field="email" name="" index="6"/>
+        <alias field="captain" name="" index="7"/>
+        <alias field="captain_phone" name="" index="8"/>
+        <alias field="captain_email" name="" index="9"/>
+        <alias field="days" name="" index="10"/>
+        <alias field="races" name="" index="11"/>
+        <alias field="first_runner" name="" index="12"/>
+        <alias field="last_runner" name="" index="13"/>
+        <alias field="instructions" name="" index="14"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="club" expression=""/>
-        <default applyOnUpdate="0" field="firstname" expression=""/>
-        <default applyOnUpdate="0" field="surname" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="phone" expression=""/>
-        <default applyOnUpdate="0" field="email" expression=""/>
-        <default applyOnUpdate="0" field="captain" expression=""/>
-        <default applyOnUpdate="0" field="captain_phone" expression=""/>
-        <default applyOnUpdate="0" field="captain_email" expression=""/>
-        <default applyOnUpdate="0" field="days" expression=""/>
-        <default applyOnUpdate="0" field="races" expression=""/>
-        <default applyOnUpdate="0" field="first_runner" expression=""/>
-        <default applyOnUpdate="0" field="last_runner" expression=""/>
-        <default applyOnUpdate="0" field="instructions" expression=""/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="club" applyOnUpdate="0"/>
+        <default expression="" field="firstname" applyOnUpdate="0"/>
+        <default expression="" field="surname" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="phone" applyOnUpdate="0"/>
+        <default expression="" field="email" applyOnUpdate="0"/>
+        <default expression="" field="captain" applyOnUpdate="0"/>
+        <default expression="" field="captain_phone" applyOnUpdate="0"/>
+        <default expression="" field="captain_email" applyOnUpdate="0"/>
+        <default expression="" field="days" applyOnUpdate="0"/>
+        <default expression="" field="races" applyOnUpdate="0"/>
+        <default expression="" field="first_runner" applyOnUpdate="0"/>
+        <default expression="" field="last_runner" applyOnUpdate="0"/>
+        <default expression="" field="instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="position" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="club" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="firstname" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="surname" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="phone" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="email" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="captain" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="captain_phone" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="captain_email" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="days" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="races" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="first_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="last_runner" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="instructions" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="club" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="firstname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="surname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="phone" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="email" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="captain" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="captain_phone" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="captain_email" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="days" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="races" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="first_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="last_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="instructions" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="position" desc="" exp=""/>
@@ -14054,23 +16456,23 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="position" type="field" width="-1"/>
-          <column hidden="0" name="name" type="field" width="221"/>
-          <column hidden="0" name="club" type="field" width="-1"/>
-          <column hidden="0" name="phone" type="field" width="-1"/>
-          <column hidden="0" name="email" type="field" width="-1"/>
-          <column hidden="0" name="captain" type="field" width="-1"/>
-          <column hidden="0" name="races" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="first_runner" type="field" width="-1"/>
-          <column hidden="0" name="last_runner" type="field" width="-1"/>
-          <column hidden="0" name="instructions" type="field" width="-1"/>
-          <column hidden="0" name="firstname" type="field" width="-1"/>
-          <column hidden="0" name="surname" type="field" width="-1"/>
-          <column hidden="0" name="captain_phone" type="field" width="-1"/>
-          <column hidden="0" name="captain_email" type="field" width="-1"/>
+          <column type="field" name="position" width="-1" hidden="0"/>
+          <column type="field" name="name" width="221" hidden="0"/>
+          <column type="field" name="club" width="-1" hidden="0"/>
+          <column type="field" name="phone" width="-1" hidden="0"/>
+          <column type="field" name="email" width="-1" hidden="0"/>
+          <column type="field" name="captain" width="-1" hidden="0"/>
+          <column type="field" name="races" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="first_runner" width="-1" hidden="0"/>
+          <column type="field" name="last_runner" width="-1" hidden="0"/>
+          <column type="field" name="instructions" width="-1" hidden="0"/>
+          <column type="field" name="firstname" width="-1" hidden="0"/>
+          <column type="field" name="surname" width="-1" hidden="0"/>
+          <column type="field" name="captain_phone" width="-1" hidden="0"/>
+          <column type="field" name="captain_email" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14102,23 +16504,23 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="10_distance"/>
-        <field editable="1" name="21_distance"/>
-        <field editable="1" name="5_distance"/>
-        <field editable="1" name="captain"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="instructions"/>
-        <field editable="1" name="last_name"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="phone"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="tshirt"/>
+        <field name="10_distance" editable="1"/>
+        <field name="21_distance" editable="1"/>
+        <field name="5_distance" editable="1"/>
+        <field name="captain" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="instructions" editable="1"/>
+        <field name="last_name" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="phone" editable="1"/>
+        <field name="position" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="10_distance"/>
@@ -14145,7 +16547,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -14210,7 +16612,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14235,58 +16637,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="141,90,153,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="141,90,153,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14317,36 +16719,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="141,90,153,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="101,64,109,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="141,90,153,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="101,64,109,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -14361,44 +16763,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="141,90,153,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="101,64,109,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="141,90,153,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="101,64,109,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14421,58 +16823,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car"/>
-          <rule symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="123,211,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14503,50 +16905,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" 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="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="4;1;1;1"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1.25"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -14577,30 +16979,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -14620,33 +17022,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="5"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -14662,32 +17064,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="miter"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -14702,9 +17104,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -14717,60 +17119,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -14801,9 +17203,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14811,20 +17213,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -14843,16 +17245,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -14862,11 +17264,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14898,8 +17300,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -14911,7 +17313,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14976,7 +17378,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15001,58 +17403,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="232,113,141,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="232,113,141,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -15083,36 +17485,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="232,113,141,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="166,81,101,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="232,113,141,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="166,81,101,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -15127,44 +17529,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="232,113,141,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="166,81,101,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="232,113,141,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="166,81,101,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15187,44 +17589,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="name" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="8.5" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.75" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="name" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="8.5" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.75" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1.5" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferJoinStyle="64"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -15239,158 +17641,158 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                <Option type="QString" name="name" value=""/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="LabelRotation">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
-                  <Option name="PositionX" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_x" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                  <Option type="Map" name="PositionX">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="field" value="label_x"/>
+                    <Option type="int" name="type" value="2"/>
                   </Option>
-                  <Option name="PositionY" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="label_y" name="field" type="QString"/>
-                    <Option value="2" name="type" type="int"/>
+                  <Option type="Map" name="PositionY">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="field" value="label_y"/>
+                    <Option type="int" name="type" value="2"/>
                   </Option>
-                  <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                  <Option type="Map" name="Size">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-20" priority="1" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="2" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="0.20000000000000001" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="1" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="0.20000000000000001" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_x"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_y"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="&quot;name&quot;" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="&quot;name&quot;"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -15421,9 +17823,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15431,28 +17833,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15461,8 +17863,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15471,8 +17873,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15481,8 +17883,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15491,8 +17893,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15501,8 +17903,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15511,8 +17913,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15521,8 +17923,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15531,45 +17933,45 @@ 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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" 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 field="id" name="" index="0"/>
+        <alias field="osm_id" name="" index="1"/>
+        <alias field="name" name="" index="2"/>
+        <alias field="type" name="" index="3"/>
+        <alias field="z_order" name="" index="4"/>
+        <alias field="population" name="" index="5"/>
+        <alias field="label_x" name="" index="6"/>
+        <alias field="label_y" name="" index="7"/>
+        <alias field="label_rota" name="" index="8"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="osm_id" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="z_order" expression=""/>
-        <default applyOnUpdate="0" field="population" expression=""/>
-        <default applyOnUpdate="0" field="label_x" expression=""/>
-        <default applyOnUpdate="0" field="label_y" expression=""/>
-        <default applyOnUpdate="0" field="label_rota" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="osm_id" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="z_order" applyOnUpdate="0"/>
+        <default expression="" field="population" applyOnUpdate="0"/>
+        <default expression="" field="label_x" applyOnUpdate="0"/>
+        <default expression="" field="label_y" applyOnUpdate="0"/>
+        <default expression="" field="label_rota" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="osm_id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="z_order" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="population" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_rota" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="osm_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="z_order" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="population" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_x" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_y" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_rota" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -15586,18 +17988,18 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="osm_id" type="field" width="-1"/>
-          <column hidden="0" name="name" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="0" name="z_order" type="field" width="-1"/>
-          <column hidden="0" name="population" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="label_x" type="field" width="-1"/>
-          <column hidden="0" name="label_y" type="field" width="-1"/>
-          <column hidden="0" name="label_rota" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="osm_id" width="-1" hidden="0"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="field" name="z_order" width="-1" hidden="0"/>
+          <column type="field" name="population" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="label_x" width="-1" hidden="0"/>
+          <column type="field" name="label_y" width="-1" hidden="0"/>
+          <column type="field" name="label_rota" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15629,15 +18031,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="population"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="z_order"/>
+        <field name="id" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="osm_id" editable="1"/>
+        <field name="population" editable="1"/>
+        <field name="type" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -15656,7 +18058,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -15721,7 +18123,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15746,58 +18148,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="255,158,23,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="255,158,23,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -15828,36 +18230,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,158,23,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="182,113,16,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,158,23,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="182,113,16,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -15872,44 +18274,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,158,23,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="182,113,16,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="255,158,23,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="182,113,16,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15932,52 +18334,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="7" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.80000000000000004" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="7" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.80000000000000004" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.59999999999999998" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="196,60,57,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="196,60,57,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="2"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -16000,34 +18402,34 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -16042,165 +18444,165 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-20" priority="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="3" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MapUnit" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="4" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="LineGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="0.29999999999999999" minFeatureSize="5" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="1" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MapUnit" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="LineGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="3" priority="3" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="5" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="0.29999999999999999" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="always_sho" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="AlwaysShow">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="always_sho"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="IsObstacle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="&quot;&quot;" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="IsObstacle">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value="&quot;&quot;"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="LabelRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="LabelRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="PositionX" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_x" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="PositionX">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_x"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="PositionY" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="label_y" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="PositionY">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="label_y"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Priority" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                <Option type="Map" name="Priority">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="Show" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="auxiliary_storage_labeling_show" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="Show">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="auxiliary_storage_labeling_show"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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="dualview/previewExpressions" type="List">
-            <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <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" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -16231,9 +18633,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16241,28 +18643,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -16271,8 +18673,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -16316,8 +18718,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -16380,58 +18782,58 @@ 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 field="osm_id" name="" index="0"/>
+        <alias field="name" name="" index="1"/>
+        <alias field="highway" name="" index="2"/>
+        <alias field="waterway" name="" index="3"/>
+        <alias field="aerialway" name="" index="4"/>
+        <alias field="barrier" name="" index="5"/>
+        <alias field="man_made" name="" index="6"/>
+        <alias field="z_order" name="" index="7"/>
+        <alias field="other_tags" name="" index="8"/>
+        <alias field="never_show" name="" index="9"/>
+        <alias field="label_x" name="" index="10"/>
+        <alias field="label_y" name="" index="11"/>
+        <alias field="label_rota" name="" index="12"/>
+        <alias field="always_sho" name="" index="13"/>
+        <alias field="resident_a" name="" index="14"/>
+        <alias field="auxiliary_storage_labeling_show" name="" index="15"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="osm_id" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="highway" expression=""/>
-        <default applyOnUpdate="0" field="waterway" expression=""/>
-        <default applyOnUpdate="0" field="aerialway" expression=""/>
-        <default applyOnUpdate="0" field="barrier" expression=""/>
-        <default applyOnUpdate="0" field="man_made" expression=""/>
-        <default applyOnUpdate="0" field="z_order" expression=""/>
-        <default applyOnUpdate="0" field="other_tags" expression=""/>
-        <default applyOnUpdate="0" field="never_show" expression=""/>
-        <default applyOnUpdate="0" field="label_x" expression=""/>
-        <default applyOnUpdate="0" field="label_y" expression=""/>
-        <default applyOnUpdate="0" field="label_rota" expression=""/>
-        <default applyOnUpdate="0" field="always_sho" expression=""/>
-        <default applyOnUpdate="0" field="resident_a" expression=""/>
-        <default applyOnUpdate="0" field="auxiliary_storage_labeling_show" expression=""/>
+        <default expression="" field="osm_id" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="highway" applyOnUpdate="0"/>
+        <default expression="" field="waterway" applyOnUpdate="0"/>
+        <default expression="" field="aerialway" applyOnUpdate="0"/>
+        <default expression="" field="barrier" applyOnUpdate="0"/>
+        <default expression="" field="man_made" applyOnUpdate="0"/>
+        <default expression="" field="z_order" applyOnUpdate="0"/>
+        <default expression="" field="other_tags" applyOnUpdate="0"/>
+        <default expression="" field="never_show" applyOnUpdate="0"/>
+        <default expression="" field="label_x" applyOnUpdate="0"/>
+        <default expression="" field="label_y" applyOnUpdate="0"/>
+        <default expression="" field="label_rota" applyOnUpdate="0"/>
+        <default expression="" field="always_sho" applyOnUpdate="0"/>
+        <default expression="" field="resident_a" applyOnUpdate="0"/>
+        <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="osm_id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="highway" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="waterway" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="aerialway" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="barrier" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="man_made" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="z_order" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="other_tags" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="never_show" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_x" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_y" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label_rota" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="always_sho" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="resident_a" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="auxiliary_storage_labeling_show" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="osm_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="highway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="waterway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="aerialway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="barrier" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="man_made" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="z_order" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="other_tags" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="never_show" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_x" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_y" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label_rota" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="always_sho" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="resident_a" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="osm_id" desc="" exp=""/>
@@ -16455,25 +18857,25 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column hidden="0" name="osm_id" type="field" width="-1"/>
-          <column hidden="0" name="name" type="field" width="160"/>
-          <column hidden="0" name="z_order" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="highway" type="field" width="-1"/>
-          <column hidden="0" name="waterway" type="field" width="-1"/>
-          <column hidden="0" name="aerialway" type="field" width="-1"/>
-          <column hidden="0" name="barrier" type="field" width="-1"/>
-          <column hidden="0" name="man_made" type="field" width="-1"/>
-          <column hidden="0" name="other_tags" type="field" width="142"/>
-          <column hidden="0" name="never_show" type="field" width="-1"/>
-          <column hidden="0" name="label_x" type="field" width="-1"/>
-          <column hidden="0" name="label_y" type="field" width="-1"/>
-          <column hidden="0" name="label_rota" type="field" width="-1"/>
-          <column hidden="0" name="always_sho" type="field" width="-1"/>
-          <column hidden="0" name="resident_a" type="field" width="-1"/>
-          <column hidden="0" name="auxiliary_storage_labeling_show" type="field" width="-1"/>
+          <column type="field" name="osm_id" width="-1" hidden="0"/>
+          <column type="field" name="name" width="160" hidden="0"/>
+          <column type="field" name="z_order" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="highway" width="-1" hidden="0"/>
+          <column type="field" name="waterway" width="-1" hidden="0"/>
+          <column type="field" name="aerialway" width="-1" hidden="0"/>
+          <column type="field" name="barrier" width="-1" hidden="0"/>
+          <column type="field" name="man_made" width="-1" hidden="0"/>
+          <column type="field" name="other_tags" width="142" hidden="0"/>
+          <column type="field" name="never_show" width="-1" hidden="0"/>
+          <column type="field" name="label_x" width="-1" hidden="0"/>
+          <column type="field" name="label_y" width="-1" hidden="0"/>
+          <column type="field" name="label_rota" width="-1" hidden="0"/>
+          <column type="field" name="always_sho" width="-1" hidden="0"/>
+          <column type="field" name="resident_a" width="-1" hidden="0"/>
+          <column type="field" name="auxiliary_storage_labeling_show" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16505,40 +18907,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="aerialway"/>
-        <field editable="1" name="always_sho"/>
-        <field editable="0" name="auxiliary_storage_labeling_show"/>
-        <field editable="1" name="barrier"/>
-        <field editable="1" name="highway"/>
-        <field editable="1" name="label_rota"/>
-        <field editable="1" name="label_x"/>
-        <field editable="1" name="label_y"/>
-        <field editable="1" name="man_made"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="never_show"/>
-        <field editable="0" name="orig_access"/>
-        <field editable="0" name="orig_always_sho"/>
-        <field editable="0" name="orig_bridge"/>
-        <field editable="0" name="orig_c_z_order"/>
-        <field editable="0" name="orig_class"/>
-        <field editable="0" name="orig_id"/>
-        <field editable="0" name="orig_label_rota"/>
-        <field editable="0" name="orig_label_x"/>
-        <field editable="0" name="orig_label_y"/>
-        <field editable="0" name="orig_name"/>
-        <field editable="0" name="orig_oneway"/>
-        <field editable="0" name="orig_ref"/>
-        <field editable="0" name="orig_service"/>
-        <field editable="0" name="orig_show"/>
-        <field editable="0" name="orig_tunnel"/>
-        <field editable="0" name="orig_type"/>
-        <field editable="0" name="orig_z_order"/>
-        <field editable="1" name="osm_id"/>
-        <field editable="1" name="other_tags"/>
-        <field editable="1" name="resident_a"/>
-        <field editable="1" name="resident_access"/>
-        <field editable="1" name="waterway"/>
-        <field editable="1" name="z_order"/>
+        <field name="aerialway" editable="1"/>
+        <field name="always_sho" editable="1"/>
+        <field name="auxiliary_storage_labeling_show" editable="0"/>
+        <field name="barrier" editable="1"/>
+        <field name="highway" editable="1"/>
+        <field name="label_rota" editable="1"/>
+        <field name="label_x" editable="1"/>
+        <field name="label_y" editable="1"/>
+        <field name="man_made" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="never_show" editable="1"/>
+        <field name="orig_access" editable="0"/>
+        <field name="orig_always_sho" editable="0"/>
+        <field name="orig_bridge" editable="0"/>
+        <field name="orig_c_z_order" editable="0"/>
+        <field name="orig_class" editable="0"/>
+        <field name="orig_id" editable="0"/>
+        <field name="orig_label_rota" editable="0"/>
+        <field name="orig_label_x" editable="0"/>
+        <field name="orig_label_y" editable="0"/>
+        <field name="orig_name" editable="0"/>
+        <field name="orig_oneway" editable="0"/>
+        <field name="orig_ref" editable="0"/>
+        <field name="orig_service" editable="0"/>
+        <field name="orig_show" editable="0"/>
+        <field name="orig_tunnel" editable="0"/>
+        <field name="orig_type" editable="0"/>
+        <field name="orig_z_order" editable="0"/>
+        <field name="osm_id" editable="1"/>
+        <field name="other_tags" editable="1"/>
+        <field name="resident_a" editable="1"/>
+        <field name="resident_access" editable="1"/>
+        <field name="waterway" editable="1"/>
+        <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="aerialway"/>
@@ -16577,22 +18979,22 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="z_order"/>
       </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>
@@ -16642,7 +19044,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -16707,7 +19109,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16732,58 +19134,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="231,113,72,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="231,113,72,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16814,36 +19216,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="231,113,72,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="165,81,51,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="231,113,72,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="165,81,51,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -16858,44 +19260,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="231,113,72,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="165,81,51,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="231,113,72,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="165,81,51,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16918,54 +19320,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
-          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
-          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
-          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
-          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
-          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
+          <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}"/>
+          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="round" name="joinstyle" type="QString"/>
-                <Option value="star" 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="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.5" 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="7" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="name" value="star"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.5"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="7"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16988,47 +19390,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,32,80,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="amenity/amenity_toilets.svg" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="0,32,80,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="amenity/amenity_toilets.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="7" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="7"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -17050,47 +19452,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/gym-bag.svg" 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="0,0,0,255" name="outline_color" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="../images/gym-bag.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="6"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -17112,57 +19514,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="fillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="3" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="125,139,143,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="../images/road_closure.svg" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="../images/road_closure.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="6"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -17184,47 +19586,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="4" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="0,12,254,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/transport_bus_stop.svg" 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="255,255,255,255" name="outline_color" type="QString"/>
-                <Option value="0" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="0,12,254,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="transport/transport_bus_stop.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="255,255,255,255"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="5"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -17244,21 +19646,21 @@ def my_form_open(dialog, layer, feature):
               <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="size_unit" v="MM"/>
               <prop k="vertical_anchor_point" v="1"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="13"/>
+                    <Option type="QString" name="blur_level" value="2.645"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="offset_angle" value="135"/>
+                    <Option type="QString" name="offset_distance" value="2"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -17275,24 +19677,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="0"/>
+                    <Option type="QString" name="blur_level" value="0.7935"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color1" value="0,0,255,255"/>
+                    <Option type="QString" name="color2" value="0,255,0,255"/>
+                    <Option type="QString" name="color_type" value="0"/>
+                    <Option type="QString" name="direction" value="ccw"/>
+                    <Option type="QString" name="discrete" value="0"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="1"/>
+                    <Option type="QString" name="opacity" value="0.5"/>
+                    <Option type="QString" name="rampType" value="gradient"/>
+                    <Option type="QString" name="single_color" value="255,255,255,255"/>
+                    <Option type="QString" name="spec" value="rgb"/>
+                    <Option type="QString" name="spread" value="2"/>
+                    <Option type="QString" name="spread_unit" value="MM"/>
+                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -17315,10 +19717,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="1" name="enabled" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="0"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="1"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -17327,18 +19729,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" name="blend_mode" type="QString"/>
-                    <Option value="2.645" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,0,255" name="color" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="135" name="offset_angle" type="QString"/>
-                    <Option value="2" name="offset_distance" type="QString"/>
-                    <Option value="MM" name="offset_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offset_unit_scale" type="QString"/>
-                    <Option value="1" name="opacity" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="13"/>
+                    <Option type="QString" name="blur_level" value="2.645"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="offset_angle" value="135"/>
+                    <Option type="QString" name="offset_distance" value="2"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -17355,24 +19757,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" name="blend_mode" type="QString"/>
-                    <Option value="0.7935" name="blur_level" type="QString"/>
-                    <Option value="MM" name="blur_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="blur_unit_scale" type="QString"/>
-                    <Option value="0,0,255,255" name="color1" type="QString"/>
-                    <Option value="0,255,0,255" name="color2" type="QString"/>
-                    <Option value="0" name="color_type" type="QString"/>
-                    <Option value="ccw" name="direction" type="QString"/>
-                    <Option value="0" name="discrete" type="QString"/>
-                    <Option value="2" name="draw_mode" type="QString"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="0.5" name="opacity" type="QString"/>
-                    <Option value="gradient" name="rampType" type="QString"/>
-                    <Option value="255,255,255,255" name="single_color" type="QString"/>
-                    <Option value="rgb" name="spec" type="QString"/>
-                    <Option value="2" name="spread" type="QString"/>
-                    <Option value="MM" name="spread_unit" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="spread_unit_scale" type="QString"/>
+                    <Option type="QString" name="blend_mode" value="0"/>
+                    <Option type="QString" name="blur_level" value="0.7935"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color1" value="0,0,255,255"/>
+                    <Option type="QString" name="color2" value="0,255,0,255"/>
+                    <Option type="QString" name="color_type" value="0"/>
+                    <Option type="QString" name="direction" value="ccw"/>
+                    <Option type="QString" name="discrete" value="0"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="opacity" value="0.5"/>
+                    <Option type="QString" name="rampType" value="gradient"/>
+                    <Option type="QString" name="single_color" value="255,255,255,255"/>
+                    <Option type="QString" name="spec" value="rgb"/>
+                    <Option type="QString" name="spread" value="2"/>
+                    <Option type="QString" name="spread_unit" value="MM"/>
+                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -17396,47 +19798,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="5" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
+            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="43,153,41,255" name="color" type="QString"/>
-                <Option value="0" name="fixedAspectRatio" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="transport/amenity=parking.svg" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="0" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="color" value="43,153,41,255"/>
+                <Option type="QString" name="fixedAspectRatio" value="0"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="name" value="transport/amenity=parking.svg"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="6" 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 type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="6"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -17458,15 +19860,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17475,32 +19877,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="name" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="name" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="2" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.80000000000000004" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="2" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.69999999999999996" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="2" shapeRadiiY="2" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="0.69999999999999996" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -17515,148 +19917,148 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelDistance" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                <Option type="QString" name="name" value=""/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="LabelDistance">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
-                  <Option name="OffsetQuad" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="2" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                  <Option type="Map" name="OffsetQuad">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="2"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
-                  <Option name="Size" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                  <Option type="Map" name="Size">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-25" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="2" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="2" dist="3" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1.8" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="10"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="2" geometryGenerator="" lineAnchorType="0" xOffset="2" dist="3" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="3" offsetUnits="MM" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="10" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="LabelDistance" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="LabelDistance">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="OffsetQuad" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="2" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="OffsetQuad">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="2"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="Size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="Size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17687,9 +20089,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17697,20 +20099,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -17743,22 +20145,22 @@ 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 field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="name" name="" index="2"/>
+        <alias field="distance" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -17770,13 +20172,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="name" type="field" width="-1"/>
-          <column hidden="0" name="distance" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="name" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17808,10 +20210,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="distance" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="distance"/>
@@ -17825,7 +20227,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiPolygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -17898,58 +20300,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="152,125,183,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="152,125,183,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17980,36 +20382,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="152,125,183,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="109,89,131,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="152,125,183,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="109,89,131,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -18024,44 +20426,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="152,125,183,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="109,89,131,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="152,125,183,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="109,89,131,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18084,42 +20486,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" locked="0" enabled="1" pass="0">
+            <layer class="LinePatternFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="135" name="angle" type="QString"/>
-                <Option value="during_render" name="clip_mode" type="QString"/>
-                <Option value="211,134,33,255" name="color" type="QString"/>
-                <Option value="feature" name="coordinate_reference" type="QString"/>
-                <Option value="2" name="distance" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="distance_map_unit_scale" type="QString"/>
-                <Option value="MM" name="distance_unit" type="QString"/>
-                <Option value="0.26" name="line_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale" 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="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 type="QString" name="angle" value="135"/>
+                <Option type="QString" name="clip_mode" value="during_render"/>
+                <Option type="QString" name="color" value="211,134,33,255"/>
+                <Option type="QString" name="coordinate_reference" value="feature"/>
+                <Option type="QString" name="distance" value="2"/>
+                <Option type="QString" name="distance_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="distance_unit" value="MM"/>
+                <Option type="QString" name="line_width" value="0.26"/>
+                <Option type="QString" name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
               </Option>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -18138,48 +20540,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@0@0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+              <symbol type="line" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                   <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="211,134,33,255" name="line_color" type="QString"/>
-                    <Option value="solid" name="line_style" type="QString"/>
-                    <Option value="0.3" 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 type="QString" name="align_dash_pattern" value="0"/>
+                    <Option type="QString" name="capstyle" value="square"/>
+                    <Option type="QString" name="customdash" value="5;2"/>
+                    <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="customdash_unit" value="MM"/>
+                    <Option type="QString" name="dash_pattern_offset" value="0"/>
+                    <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                    <Option type="QString" name="draw_inside_polygon" value="0"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="line_color" value="211,134,33,255"/>
+                    <Option type="QString" name="line_style" value="solid"/>
+                    <Option type="QString" name="line_width" value="0.3"/>
+                    <Option type="QString" name="line_width_unit" value="MM"/>
+                    <Option type="QString" name="offset" value="0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="ring_filter" value="0"/>
+                    <Option type="QString" name="trim_distance_end" value="0"/>
+                    <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                    <Option type="QString" name="trim_distance_start" value="0"/>
+                    <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                    <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                    <Option type="QString" name="use_custom_dash" value="0"/>
+                    <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -18210,27 +20612,27 @@ def my_form_open(dialog, layer, feature):
                   <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="211,134,33,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="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.46" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="no" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="211,134,33,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.46"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="no"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -18245,9 +20647,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18258,60 +20660,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18342,9 +20744,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18352,20 +20754,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="1" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="FID" configurationFlags="None">
@@ -18377,13 +20779,13 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias field="FID" name="" index="0"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="FID" expression=""/>
+        <default expression="" field="FID" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="FID" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="FID" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="FID" desc="" exp=""/>
@@ -18392,11 +20794,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="431"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="431" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18428,8 +20830,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -18441,7 +20843,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -18506,7 +20908,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18531,58 +20933,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="190,207,80,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="190,207,80,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18613,36 +21015,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,207,80,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="136,148,57,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="190,207,80,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,148,57,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -18657,44 +21059,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,207,80,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="136,148,57,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="190,207,80,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,148,57,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18717,61 +21119,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'" label="Road Open"/>
-          <rule symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'" label="No Parking"/>
-          <rule symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed"/>
-          <rule symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'" label="One-Way"/>
-          <rule symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'" label="Road Closures"/>
+          <rule symbol="0" label="Road Open" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule symbol="1" label="No Parking" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule symbol="2" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule symbol="3" label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule symbol="4" label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,255,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18802,50 +21204,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="2" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="2"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -18865,40 +21267,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="255,255,255,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="circle" 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="0,255,0,255" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0.5" 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="1" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="circle"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="0,255,0,255"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0.5"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="1"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18921,52 +21323,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="2" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="2;1;1;1" 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="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash dot dot" name="line_style" type="QString"/>
-                <Option value="0.75" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="2;1;1;1"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,255,0,255"/>
+                <Option type="QString" name="line_style" value="dash dot dot"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18997,41 +21399,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="25"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -19051,46 +21453,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@2@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" 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="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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.5" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,255,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3.5"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -19113,58 +21515,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="outlineStyle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="3" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="3;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="0,255,0,255" name="line_color" type="QString"/>
-                <Option value="dash" name="line_style" type="QString"/>
-                <Option value="0.75" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="3;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="0,255,0,255"/>
+                <Option type="QString" name="line_style" value="dash"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19195,41 +21597,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="250" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="25" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MapUnit" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="Interval" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="250"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MapUnit"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="25"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="Interval"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -19249,46 +21651,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="enabled">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@3@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@3@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="square" name="cap_style" type="QString"/>
-                    <Option value="0,255,0,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="bevel" name="joinstyle" type="QString"/>
-                    <Option value="filled_arrowhead" 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="35,35,35,0" name="outline_color" type="QString"/>
-                    <Option value="solid" name="outline_style" type="QString"/>
-                    <Option value="0" 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.5" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="cap_style" value="square"/>
+                    <Option type="QString" name="color" value="0,255,0,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
+                    <Option type="QString" name="outline_style" value="solid"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="3.5"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -19311,58 +21713,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="outlineStyle">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="4" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="255,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.75" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="255,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.75"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19393,20 +21795,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="outlineColor">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="outlineStyle" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19415,32 +21817,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="times" fontWeight="50" fontLetterSpacing="0" namedStyle="Regular" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="9" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="times" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="9" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -19455,116 +21857,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="2" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -19595,9 +21997,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19605,20 +22007,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -19651,22 +22053,22 @@ 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 field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="status" name="" index="2"/>
+        <alias field="times" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="status" expression=""/>
-        <default applyOnUpdate="0" field="times" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="status" applyOnUpdate="0"/>
+        <default expression="" field="times" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="status" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="times" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="status" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="times" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -19678,13 +22080,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="type" type="field" width="202"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="status" type="field" width="-1"/>
-          <column hidden="0" name="times" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="type" width="202" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="status" width="-1" hidden="0"/>
+          <column type="field" name="times" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19716,10 +22118,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="status"/>
-        <field editable="1" name="times"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="status" editable="1"/>
+        <field name="times" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -19733,21 +22135,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
-        <xmin>18.37543911768802474</xmin>
+        <xmin>18.37571523317913247</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.90013265894425842</ymax>
+        <ymax>-33.89978292253275782</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37543911768802474</xmin>
+        <xmin>18.37571523317913247</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.90013265894425842</ymax>
+        <ymax>-33.89978292253275782</ymax>
       </wgs84extent>
-      <id>route_markers_6943d827_bf32_40af_988d_60a736c1d3e1</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=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(4,0)&amp;field=day:integer(2,0)</datasource>
+      <id>route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1</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>
@@ -19772,15 +22174,6 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -19797,15 +22190,7 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
+        <extent/>
       </resourceMetadata>
       <provider encoding="">memory</provider>
       <vectorjoins/>
@@ -19823,58 +22208,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="225,89,137,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="225,89,137,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19905,36 +22290,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="225,89,137,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="161,64,98,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="161,64,98,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -19949,44 +22334,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="225,89,137,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="161,64,98,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="161,64,98,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20009,54 +22394,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{cde085cc-58f2-4c49-a2cc-2614d5832170}">
-          <rule key="{95db1799-9de4-4074-994e-29c2f4e9f52f}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes" key="{95db1799-9de4-4074-994e-29c2f4e9f52f}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -20079,34 +22464,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" 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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -20121,138 +22506,138 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="3" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="PointGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{379f64c2-b5f6-4f7d-a33c-c6a10b65e7ef}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" 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="{379f64c2-b5f6-4f7d-a33c-c6a10b65e7ef}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="213,180,60,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -20275,34 +22660,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="0,0,0,255" name="color" type="QString"/>
-                        <Option value="round" 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="0,0,0,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="1" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -20317,131 +22702,131 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option value="true" name="active" type="bool"/>
-                              <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" name="expression" type="QString"/>
-                              <Option value="3" name="type" type="int"/>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="3" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="PointGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="quadrant" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="rotation" name="field" type="QString"/>
-                      <Option value="2" name="type" type="int"/>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
                     </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{72924649-3eef-4d1a-8529-de69270205d9}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends">
-            <rule key="{e7facde6-7dab-47b6-82a7-d1c25c9249a4}" active="0" filter="&quot;Source&quot; = '21KM'" 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="{72924649-3eef-4d1a-8529-de69270205d9}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{e7facde6-7dab-47b6-82a7-d1c25c9249a4}">
               <settings calloutType="simple">
-                <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                  <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeFillColor="210,32,39,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                    <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="210,32,39,255" name="color" type="QString"/>
-                          <Option value="round" 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="210,32,39,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="210,32,39,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -20456,130 +22841,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-                <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="3" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-                <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}" active="0" filter="&quot;Source&quot; = '10KM'" description="10KM">
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
               <settings calloutType="simple">
-                <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                  <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeFillColor="103,34,144,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                    <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="103,34,144,255" name="color" type="QString"/>
-                          <Option value="round" 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="103,34,144,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="103,34,144,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -20594,130 +22979,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-                <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-                <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}" active="0" filter="&quot;Source&quot; = '5KM'" description="5KM">
+            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
               <settings calloutType="simple">
-                <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                  <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                    <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="145,211,55,255" name="color" type="QString"/>
-                          <Option value="round" 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="145,211,55,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="145,211,55,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -20732,138 +23117,138 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
                         </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option value="true" name="active" type="bool"/>
-                          <Option value="quadrant" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="rotation" name="field" type="QString"/>
-                          <Option value="2" name="type" type="int"/>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-                <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-                <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}" active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail">
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
               <settings calloutType="simple">
-                <text-style forcedItalic="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="255,255,255,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1" bufferJoinStyle="64"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                  <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="1" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSizeX="1" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                    <symbol alpha="1" frame_rate="10" name="markerSymbol" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="0" name="angle" type="QString"/>
-                          <Option value="square" name="cap_style" type="QString"/>
-                          <Option value="133,182,111,255" name="color" type="QString"/>
-                          <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                          <Option value="bevel" name="joinstyle" type="QString"/>
-                          <Option value="circle" 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="35,35,35,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                          <Option type="QString" name="cap_style" value="square"/>
+                          <Option type="QString" name="color" value="133,182,111,255"/>
+                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                          <Option type="QString" name="joinstyle" value="bevel"/>
+                          <Option type="QString" name="name" value="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
                         </Option>
                         <prop k="angle" v="0"/>
                         <prop k="cap_style" v="square"/>
@@ -20886,34 +23271,34 @@ def my_form_open(dialog, layer, feature):
                         <prop k="vertical_anchor_point" v="1"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                          <Option value="0,72,255,255" name="color" type="QString"/>
-                          <Option value="round" 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="0,72,255,255" name="outline_color" type="QString"/>
-                          <Option value="solid" name="outline_style" type="QString"/>
-                          <Option value="1" name="outline_width" type="QString"/>
-                          <Option value="MM" name="outline_width_unit" type="QString"/>
-                          <Option value="solid" name="style" type="QString"/>
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="0,72,255,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="0,72,255,255"/>
@@ -20928,77 +23313,77 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="0" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-                <placement maxCurvedCharAngleOut="-20" priority="10" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="6" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="1" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="2" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="20" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="PointGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-                <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="2" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="0"/>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="1" name="type" type="int"/>
-                        <Option value="" name="val" type="QString"/>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
                       </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option value="true" name="active" type="bool"/>
-                        <Option value="quadrant" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option value="false" name="active" type="bool"/>
-                        <Option value="rotation" name="field" type="QString"/>
-                        <Option value="2" name="type" type="int"/>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                    <Option value="0" name="blendMode" type="int"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option value="false" name="drawToAllParts" type="bool"/>
-                    <Option value="0" name="enabled" type="QString"/>
-                    <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                    <Option value="0" name="minLength" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                    <Option value="MM" name="minLengthUnit" type="QString"/>
-                    <Option value="0" name="offsetFromAnchor" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                    <Option value="0" name="offsetFromLabel" type="double"/>
-                    <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                    <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -21008,62 +23393,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="100000" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21094,9 +23479,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21104,28 +23489,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21134,8 +23519,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21144,8 +23529,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21154,8 +23539,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21164,8 +23549,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21174,8 +23559,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21184,8 +23569,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21194,8 +23579,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21207,53 +23592,6 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="quadrant" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
         <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
@@ -21261,57 +23599,104 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="length_km" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_m" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="org_fid" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </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="length_m" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="org_fid" index="11" name=""/>
-        <alias field="distance" index="12" name=""/>
-        <alias field="quadrant" index="13" name=""/>
-        <alias field="day" index="14" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_km" name="" index="10"/>
+        <alias field="length_m" name="" index="11"/>
+        <alias field="org_fid" name="" index="12"/>
+        <alias field="distance" name="" index="13"/>
+        <alias field="quadrant" name="" index="14"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="Sort" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="org_fid" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
-        <default applyOnUpdate="0" field="quadrant" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <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" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="descriptio" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="timestamp" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="begin" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="end" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Distance" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="RouteLen" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Source" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Sort" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_m" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_km" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="org_fid" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="quadrant" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="day" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="quadrant" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" desc="" exp=""/>
@@ -21323,35 +23708,35 @@ def my_form_open(dialog, layer, feature):
         <constraint field="RouteLen" desc="" exp=""/>
         <constraint field="Source" desc="" exp=""/>
         <constraint field="Sort" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
         <constraint field="length_km" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
         <constraint field="org_fid" desc="" exp=""/>
         <constraint field="distance" desc="" exp=""/>
         <constraint field="quadrant" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="org_fid" type="field" width="-1"/>
-          <column hidden="0" name="distance" type="field" width="-1"/>
-          <column hidden="0" name="Name" type="field" width="-1"/>
-          <column hidden="0" name="Source" type="field" width="-1"/>
-          <column hidden="0" name="RouteLen" type="field" width="-1"/>
-          <column hidden="0" name="descriptio" type="field" width="-1"/>
-          <column hidden="0" name="timestamp" type="field" width="-1"/>
-          <column hidden="0" name="begin" type="field" width="-1"/>
-          <column hidden="0" name="end" type="field" width="-1"/>
-          <column hidden="0" name="Distance" type="field" width="-1"/>
-          <column hidden="0" name="length_km" type="field" width="-1"/>
-          <column hidden="0" name="Sort" type="field" width="-1"/>
-          <column hidden="0" name="quadrant" type="field" width="-1"/>
-          <column hidden="0" name="day" type="field" width="-1"/>
-          <column hidden="0" name="length_m" type="field" width="-1"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="-1" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="Sort" width="-1" hidden="0"/>
+          <column type="field" name="quadrant" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21383,21 +23768,21 @@ def my_form_open(dialog, layer, feature):
       <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"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -21417,28 +23802,1716 @@ def my_form_open(dialog, layer, feature):
         <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"/>
+        <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>Text</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiPolygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+      <extent>
+        <xmin>18.37543911768802474</xmin>
+        <ymin>-33.95582126985814853</ymin>
+        <xmax>18.42275999405387665</xmax>
+        <ymax>-33.90013265894425842</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37543911768802474</xmin>
+        <ymin>-33.95582126985814853</ymin>
+        <xmax>18.42275999405387665</xmax>
+        <ymax>-33.90013265894425842</ymax>
+      </wgs84extent>
+      <id>route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7</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_m:integer(6,0)&amp;field=length_km: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/>
+        <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 limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+        <data-defined-properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data-defined-properties>
+        <profileLineSymbol>
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="225,89,137,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="225,89,137,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.6"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileLineSymbol>
+        <profileFillSymbol>
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="161,64,98,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="225,89,137,255"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="161,64,98,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileFillSymbol>
+        <profileMarkerSymbol>
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <Option type="Map">
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="225,89,137,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="161,64,98,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
+              </Option>
+              <prop k="angle" v="0"/>
+              <prop k="cap_style" v="square"/>
+              <prop k="color" v="225,89,137,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="diamond"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="161,64,98,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="3"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileMarkerSymbol>
+      </elevation>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <labeling type="rule-based">
+        <rules key="{cde085cc-58f2-4c49-a2cc-2614d5832170}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes" key="{95db1799-9de4-4074-994e-29c2f4e9f52f}">
+            <settings calloutType="simple">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <families/>
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="213,180,60,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="joinstyle" v="round"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="0,0,0,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="1"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
+                    </Option>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
+                    </Option>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </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="{379f64c2-b5f6-4f7d-a33c-c6a10b65e7ef}">
+            <settings calloutType="simple">
+              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <families/>
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
+                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="213,180,60,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" name="name" value=""/>
+                        <Option name="properties"/>
+                        <Option type="QString" name="type" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <Option type="Map">
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="0,0,0,255"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="1"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
+                      </Option>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,0,0,255"/>
+                      <prop k="joinstyle" v="round"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="0,0,0,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="1"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option type="Map" name="properties">
+                            <Option type="Map" name="fillColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                            <Option type="Map" name="outlineColor">
+                              <Option type="bool" name="active" value="true"/>
+                              <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="PositionX">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="PositionY">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
+                    </Option>
+                    <Option type="Map" name="PredefinedPositionOrder">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="field" value="quadrant"/>
+                      <Option type="int" name="type" value="2"/>
+                    </Option>
+                    <Option type="Map" name="Rotation">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="field" value="rotation"/>
+                      <Option type="int" name="type" value="2"/>
+                    </Option>
+                    <Option type="Map" name="ShapeBorderColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                    <Option type="Map" name="ShapeFillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </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="{72924649-3eef-4d1a-8529-de69270205d9}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{e7facde6-7dab-47b6-82a7-d1c25c9249a4}">
+              <settings calloutType="simple">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                  <families/>
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="210,32,39,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
+                        </Option>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="210,32,39,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="210,32,39,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
+              <settings calloutType="simple">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                  <families/>
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="103,34,144,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
+                        </Option>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="103,34,144,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="103,34,144,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
+              <settings calloutType="simple">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                  <families/>
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="145,211,55,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
+                        </Option>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="145,211,55,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="145,211,55,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option type="Map" name="properties">
+                        <Option type="Map" name="PositionX">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PositionY">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="int" name="type" value="1"/>
+                          <Option type="QString" name="val" value=""/>
+                        </Option>
+                        <Option type="Map" name="PredefinedPositionOrder">
+                          <Option type="bool" name="active" value="true"/>
+                          <Option type="QString" name="field" value="quadrant"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                        <Option type="Map" name="Rotation">
+                          <Option type="bool" name="active" value="false"/>
+                          <Option type="QString" name="field" value="rotation"/>
+                          <Option type="int" name="type" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
+              <settings calloutType="simple">
+                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                  <families/>
+                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
+                    <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="angle" value="0"/>
+                          <Option type="QString" name="cap_style" value="square"/>
+                          <Option type="QString" name="color" value="133,182,111,255"/>
+                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                          <Option type="QString" name="joinstyle" value="bevel"/>
+                          <Option type="QString" name="name" value="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        </Option>
+                        <prop k="angle" v="0"/>
+                        <prop k="cap_style" v="square"/>
+                        <prop k="color" v="133,182,111,255"/>
+                        <prop k="horizontal_anchor_point" v="1"/>
+                        <prop k="joinstyle" v="bevel"/>
+                        <prop k="name" v="circle"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="35,35,35,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="0"/>
+                        <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="scale_method" v="diameter"/>
+                        <prop k="size" v="2"/>
+                        <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="size_unit" v="MM"/>
+                        <prop k="vertical_anchor_point" v="1"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                        <Option type="Map">
+                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="color" value="0,72,255,255"/>
+                          <Option type="QString" name="joinstyle" value="round"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="1"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="style" value="solid"/>
+                        </Option>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="0,72,255,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="0,72,255,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option type="Map" name="properties">
+                      <Option type="Map" name="PositionX">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PositionY">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="int" name="type" value="1"/>
+                        <Option type="QString" name="val" value=""/>
+                      </Option>
+                      <Option type="Map" name="PredefinedPositionOrder">
+                        <Option type="bool" name="active" value="true"/>
+                        <Option type="QString" name="field" value="quadrant"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                      <Option type="Map" name="Rotation">
+                        <Option type="bool" name="active" value="false"/>
+                        <Option type="QString" name="field" value="rotation"/>
+                        <Option type="int" name="type" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                    <Option type="int" name="blendMode" value="0"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                    <Option type="bool" name="drawToAllParts" value="false"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+          </rule>
+        </rules>
+      </labeling>
+      <customproperties>
+        <Option type="Map">
+          <Option type="QString" name="QFieldSync/action" value="no_action"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+          </Option>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+          <axisSymbol>
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+                <Option type="Map">
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                </Option>
+                <prop k="align_dash_pattern" v="0"/>
+                <prop k="capstyle" v="square"/>
+                <prop k="customdash" v="5;2"/>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="customdash_unit" v="MM"/>
+                <prop k="dash_pattern_offset" v="0"/>
+                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="dash_pattern_offset_unit" v="MM"/>
+                <prop k="draw_inside_polygon" v="0"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="line_color" v="35,35,35,255"/>
+                <prop k="line_style" v="solid"/>
+                <prop k="line_width" v="0.26"/>
+                <prop k="line_width_unit" v="MM"/>
+                <prop k="offset" v="0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="ring_filter" v="0"/>
+                <prop k="trim_distance_end" v="0"/>
+                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="trim_distance_end_unit" v="MM"/>
+                <prop k="trim_distance_start" v="0"/>
+                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="trim_distance_start_unit" v="MM"/>
+                <prop k="tweak_dash_pattern_on_corners" v="0"/>
+                <prop k="use_custom_dash" v="0"/>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+        <properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="descriptio" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="timestamp" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="begin" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="end" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="RouteLen" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Source" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" 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="length_m" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_km" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="org_fid" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="quadrant" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_m" name="" index="10"/>
+        <alias field="length_km" name="" index="11"/>
+        <alias field="org_fid" name="" index="12"/>
+        <alias field="distance" name="" index="13"/>
+        <alias field="quadrant" name="" index="14"/>
+      </aliases>
+      <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_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="quadrant" applyOnUpdate="0"/>
+      </defaults>
+      <constraints>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="quadrant" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="quadrant" desc="" exp=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
+        <columns>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="begin" width="-1" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="Distance" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="Sort" width="-1" hidden="0"/>
+          <column type="field" name="quadrant" width="-1" hidden="0"/>
+          <column type="field" name="day" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+        </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 name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Sort" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
+      </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 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>Text</mapTip>
+    </maplayer>
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -21511,58 +25584,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="229,182,54,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="229,182,54,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21593,36 +25666,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="229,182,54,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="164,130,39,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="164,130,39,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -21637,44 +25710,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="229,182,54,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="164,130,39,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="164,130,39,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21697,38 +25770,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="singleSymbol" enableorderby="0">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="114,155,111,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="114,155,111,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -21743,9 +25816,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21756,22 +25829,22 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -21797,19 +25870,19 @@ 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 field="id" name="" index="0"/>
+        <alias field="area" name="" index="1"/>
+        <alias field="rotation" name="" index="2"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="area" expression=""/>
-        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="area" applyOnUpdate="0"/>
+        <default expression="" field="rotation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="area" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="rotation" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="area" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="rotation" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -21820,12 +25893,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="area" type="field" width="-1"/>
-          <column hidden="0" name="rotation" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="area" width="-1" hidden="0"/>
+          <column type="field" name="rotation" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21848,7 +25921,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -21913,7 +25986,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21938,58 +26011,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="196,60,57,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="196,60,57,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22020,36 +26093,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="196,60,57,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="140,43,41,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="196,60,57,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="140,43,41,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -22064,44 +26137,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="196,60,57,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="140,43,41,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="196,60,57,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="140,43,41,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22124,49 +26197,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0" label="All distances"/>
+          <rule symbol="0" label="All distances" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="1" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="1">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" 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="35,35,35,0" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0" 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="0.5" 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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,0"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="0.5"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22189,20 +26262,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <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" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                  <Option type="QString" name="name" value=""/>
+                  <Option type="Map" name="properties">
+                    <Option type="Map" name="fillColor">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                     </Option>
-                    <Option name="size" type="Map">
-                      <Option value="false" name="active" type="bool"/>
-                      <Option value="1" name="type" type="int"/>
-                      <Option value="" name="val" type="QString"/>
+                    <Option type="Map" name="size">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="int" name="type" value="1"/>
+                      <Option type="QString" name="val" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22214,64 +26287,64 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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="dualview/previewExpressions" type="StringList">
-            <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 type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="StringList" name="dualview/previewExpressions">
+            <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" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -22302,9 +26375,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22312,20 +26385,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
@@ -22353,8 +26426,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22370,8 +26443,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22380,8 +26453,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22430,49 +26503,49 @@ 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 field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="RouteLen" name="" index="5"/>
+        <alias field="Source" name="" index="6"/>
+        <alias field="length_m" name="" index="7"/>
+        <alias field="length_km" name="" index="8"/>
+        <alias field="org_fid" name="" index="9"/>
+        <alias field="distance" name="" index="10"/>
+        <alias field="first_runn" name="" index="11"/>
+        <alias field="last_runne" name="" index="12"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="org_fid" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
-        <default applyOnUpdate="0" field="first_runn" expression=""/>
-        <default applyOnUpdate="0" field="last_runne" expression=""/>
+        <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="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="first_runn" applyOnUpdate="0"/>
+        <default expression="" field="last_runne" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="descriptio" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="timestamp" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="begin" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="end" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="RouteLen" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="Source" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_m" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="length_km" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="org_fid" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="distance" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="first_runn" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="last_runne" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="first_runn" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="last_runne" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" desc="" exp=""/>
@@ -22493,22 +26566,22 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column hidden="0" name="begin" type="field" width="179"/>
-          <column hidden="0" name="RouteLen" type="field" width="-1"/>
-          <column hidden="0" name="Source" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="Name" type="field" width="-1"/>
-          <column hidden="0" name="length_m" type="field" width="-1"/>
-          <column hidden="0" name="length_km" type="field" width="-1"/>
-          <column hidden="0" name="org_fid" type="field" width="-1"/>
-          <column hidden="0" name="first_runn" type="field" width="-1"/>
-          <column hidden="0" name="last_runne" type="field" width="-1"/>
-          <column hidden="0" name="descriptio" type="field" width="-1"/>
-          <column hidden="0" name="timestamp" type="field" width="-1"/>
-          <column hidden="0" name="end" type="field" width="-1"/>
-          <column hidden="0" name="distance" type="field" width="-1"/>
+          <column type="field" name="begin" width="179" hidden="0"/>
+          <column type="field" name="RouteLen" width="-1" hidden="0"/>
+          <column type="field" name="Source" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="Name" width="-1" hidden="0"/>
+          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <column type="field" name="length_km" width="-1" hidden="0"/>
+          <column type="field" name="org_fid" width="-1" hidden="0"/>
+          <column type="field" name="first_runn" width="-1" hidden="0"/>
+          <column type="field" name="last_runne" width="-1" hidden="0"/>
+          <column type="field" name="descriptio" width="-1" hidden="0"/>
+          <column type="field" name="timestamp" width="-1" hidden="0"/>
+          <column type="field" name="end" width="-1" hidden="0"/>
+          <column type="field" name="distance" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22540,31 +26613,31 @@ def my_form_open(dialog, layer, feature):
       <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="Source"/>
-        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
-        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="display"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="distance_1"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="first_run"/>
-        <field editable="1" name="first_runn"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="first_runner_s"/>
-        <field editable="0" name="last_run"/>
-        <field editable="1" name="last_runn"/>
-        <field editable="1" name="last_runne"/>
-        <field editable="1" name="last_runner"/>
-        <field editable="1" name="last_runner_s"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="timestamp"/>
+        <field name="Distance" editable="1"/>
+        <field name="Name" editable="1"/>
+        <field name="RouteLen" editable="1"/>
+        <field name="Source" editable="1"/>
+        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
+        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="display" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="distance_1" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="first_run" editable="1"/>
+        <field name="first_runn" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="first_runner_s" editable="1"/>
+        <field name="last_run" editable="0"/>
+        <field name="last_runn" editable="1"/>
+        <field name="last_runne" editable="1"/>
+        <field name="last_runner" editable="1"/>
+        <field name="last_runner_s" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -22599,7 +26672,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiLineString" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="0" autoRefreshTime="0" simplifyMaxScale="1" geometry="Line">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22672,58 +26745,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="190,178,151,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="190,178,151,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22754,36 +26827,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="190,178,151,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="136,127,108,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="190,178,151,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,127,108,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -22798,44 +26871,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="190,178,151,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="136,127,108,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="190,178,151,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="136,127,108,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22858,58 +26931,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car"/>
-          <rule symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol alpha="1" frame_rate="10" name="0" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="123,211,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="123,211,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22940,50 +27013,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" frame_rate="10" name="1" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="flat" name="capstyle" type="QString"/>
-                <Option value="4;1;1;1" 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="103,34,144,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="1.25" 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="1" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="flat"/>
+                <Option type="QString" name="customdash" value="4;1;1;1"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="103,34,144,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="1.25"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="1"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -23014,30 +27087,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
+            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="4" name="average_angle_length" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale" type="QString"/>
-                <Option value="MM" name="average_angle_unit" type="QString"/>
-                <Option value="3" name="interval" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="interval_map_unit_scale" type="QString"/>
-                <Option value="MM" name="interval_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="0" name="offset_along_line" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_along_line_unit" 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="true" name="place_on_every_part" type="bool"/>
-                <Option value="LastVertex" name="placements" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="1" name="rotate" type="QString"/>
+                <Option type="QString" name="average_angle_length" value="4"/>
+                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="average_angle_unit" value="MM"/>
+                <Option type="QString" name="interval" value="3"/>
+                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="interval_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_along_line" value="0"/>
+                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_along_line_unit" value="MM"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="bool" name="place_on_every_part" value="true"/>
+                <Option type="QString" name="placements" value="LastVertex"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="rotate" value="1"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -23057,33 +27130,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" frame_rate="10" name="@1@1" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
+                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="0" name="angle" type="QString"/>
-                    <Option value="103,34,144,255" name="color" type="QString"/>
-                    <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                    <Option value="filled_arrowhead" 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="diameter" name="scale_method" type="QString"/>
-                    <Option value="5" 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 type="QString" name="angle" value="0"/>
+                    <Option type="QString" name="color" value="103,34,144,255"/>
+                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                    <Option type="QString" name="name" value="filled_arrowhead"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="scale_method" value="diameter"/>
+                    <Option type="QString" name="size" value="5"/>
+                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="size_unit" value="MM"/>
+                    <Option type="QString" name="vertical_anchor_point" value="1"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -23099,32 +27172,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" frame_rate="10" name="@@1@1@0" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="103,34,144,255" name="color" type="QString"/>
-                        <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="no" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="103,34,144,255"/>
+                        <Option type="QString" name="joinstyle" value="miter"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -23139,9 +27212,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -23154,60 +27227,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <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 value="id" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="id"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23238,9 +27311,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23248,20 +27321,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="2" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -23280,16 +27353,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="type" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -23299,11 +27372,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="type" type="field" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="type" width="-1" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23335,8 +27408,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="type"/>
+        <field name="id" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -23348,7 +27421,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="Point" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Point">
+    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -23421,58 +27494,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="145,82,45,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="145,82,45,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23503,36 +27576,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="145,82,45,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="104,59,32,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="145,82,45,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="104,59,32,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -23547,44 +27620,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="145,82,45,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="104,59,32,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="145,82,45,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="104,59,32,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -23607,44 +27680,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style forcedItalic="0" fontKerning="1" fieldName="label" fontWeight="63" fontLetterSpacing="0" namedStyle="Semibold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="15" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="1" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="label" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="15" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
             <families/>
-            <text-buffer bufferDraw="1" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -23659,115 +27732,115 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="3" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MM" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="4" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="0" dist="0" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-          <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="0" unplacedVisibility="0" obstacleFactor="1" minFeatureSize="0" obstacle="1" maxNumLabels="2000" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="0" zIndex="0"/>
+          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="0" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-              <Option value="0" name="blendMode" type="int"/>
-              <Option name="ddProperties" type="Map">
-                <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+              <Option type="int" name="blendMode" value="0"/>
+              <Option type="Map" name="ddProperties">
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option value="false" name="drawToAllParts" type="bool"/>
-              <Option value="0" name="enabled" type="QString"/>
-              <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-              <Option value="0" name="minLength" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-              <Option value="MM" name="minLengthUnit" type="QString"/>
-              <Option value="0" name="offsetFromAnchor" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-              <Option value="0" name="offsetFromLabel" type="double"/>
-              <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-              <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+              <Option type="bool" name="drawToAllParts" value="false"/>
+              <Option type="QString" name="enabled" value="0"/>
+              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <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 value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23798,9 +27871,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23808,20 +27881,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -23840,16 +27913,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="label" name="" index="1"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="label" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="label" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -23859,11 +27932,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="0" name="label" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="field" name="label" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23895,8 +27968,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -23908,7 +27981,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" minScale="100000000" autoRefreshEnabled="0" readOnly="0" refreshOnNotifyEnabled="0" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" refreshOnNotifyMessage="" wkbType="MultiPolygon" symbologyReferenceScale="-1" simplifyLocal="1" type="vector" labelsEnabled="1" autoRefreshTime="0" simplifyMaxScale="1" geometry="Polygon">
+    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -23973,7 +28046,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" minz="0" maxz="0" miny="0" dimensions="2" crs="" maxy="0" maxx="0"/>
+          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23998,58 +28071,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" limitMode="0" endExpression="" startField="" accumulate="0" enabled="0" mode="0" startExpression="" durationUnit="min" endField="" fixedDuration="0">
+      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" extrusionEnabled="0" extrusion="0" zoffset="0" binding="Centroid" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" symbology="Line" zscale="1" clamping="Terrain">
+      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="125,139,143,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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="line_color" value="125,139,143,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.6"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -24080,36 +28153,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="125,139,143,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="89,99,102,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 type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="89,99,102,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -24124,44 +28197,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="125,139,143,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="89,99,102,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 type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="125,139,143,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="diamond"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="89,99,102,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.2"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="3"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24184,46 +28257,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" referencescale="-1" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}">
             <settings calloutType="simple">
-              <text-style forcedItalic="0" fontKerning="1" fieldName="label" fontWeight="75" fontLetterSpacing="0" namedStyle="Bold" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="31,120,180,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="8" multilineHeight="1" fontFamily="Myriad Pro" useSubstitutions="0" textOrientation="horizontal" legendString="Aa" textOpacity="0.90000000000000002" fontSizeUnit="Point" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+              <text-style textColor="31,120,180,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="label" fontFamily="Myriad Pro" namedStyle="Bold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="75" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
                 <families/>
-                <text-buffer bufferDraw="0" bufferSize="0.75" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.40000000000000002" bufferJoinStyle="128"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-                <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeFillColor="255,255,255,204" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.29999999999999999" shapeRadiiX="0.5" shapeOffsetY="-0.14999999999999999" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeSizeX="0.75" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.75" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-                  <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeBorderWidth="0.75" shapeJoinStyle="128" shapeOffsetY="-0.14999999999999999" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeSizeType="0" shapeSizeY="0.29999999999999999" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,204" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
+                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                        <Option value="255,255,255,204" name="color" type="QString"/>
-                        <Option value="round" 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="31,120,206,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0.75" name="outline_width" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="solid" name="style" type="QString"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,204"/>
+                        <Option type="QString" name="joinstyle" value="round"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="31,120,206,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0.75"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -24238,56 +28311,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" decimals="3" plussign="0" formatNumbers="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="1" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1"/>
-              <placement maxCurvedCharAngleOut="-25" priority="5" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" offsetUnits="MapUnit" placement="0" rotationUnit="AngleDegrees" fitInPolygonOnly="0" polygonPlacementFlags="2" geometryGenerator="" quadOffset="1" allowDegraded="0" repeatDistanceUnits="MM" lineAnchorType="0" distUnits="MM" xOffset="1" dist="0" centroidWhole="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistance="0" maxCurvedCharAngleIn="25" placementFlags="10" overrunDistance="0" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" layerType="UnknownGeometry" preserveRotation="1" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" geometryGeneratorType="PointGeometry" centroidInside="0" offsetType="0"/>
-              <rendering upsidedownLabels="0" fontMinPixelSize="3" fontLimitPixelSize="0" scaleMin="1" unplacedVisibility="0" obstacleFactor="0.76000000000000001" minFeatureSize="0" obstacle="1" maxNumLabels="6" scaleVisibility="0" drawLabels="1" labelPerPart="0" obstacleType="0" mergeLines="0" fontMaxPixelSize="10000" limitNumLabels="0" scaleMax="10000000" zIndex="5"/>
+              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
+              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="1" geometryGenerator="" lineAnchorType="0" xOffset="1" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="1" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="0.76000000000000001" maxNumLabels="6" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" name="anchorPoint" type="QString"/>
-                  <Option value="0" name="blendMode" type="int"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+                  <Option type="int" name="blendMode" value="0"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option value="false" name="drawToAllParts" type="bool"/>
-                  <Option value="0" name="enabled" type="QString"/>
-                  <Option value="point_on_exterior" name="labelAnchorPoint" type="QString"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; name=&quot;align_dash_pattern&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;square&quot; name=&quot;capstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;5;2&quot; name=&quot;customdash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;customdash_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;bevel&quot; name=&quot;joinstyle&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;60,60,60,255&quot; name=&quot;line_color&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;solid&quot; name=&quot;line_style&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0.3&quot; name=&quot;line_width&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;line_width_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;offset&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;offset_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;ring_filter&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_end&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;trim_distance_start&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;0&quot; name=&quot;use_custom_dash&quot; type=&quot;QString&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; name=&quot;name&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; name=&quot;type&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol" type="QString"/>
-                  <Option value="0" name="minLength" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale" type="QString"/>
-                  <Option value="MM" name="minLengthUnit" type="QString"/>
-                  <Option value="0" name="offsetFromAnchor" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromAnchorUnit" type="QString"/>
-                  <Option value="0" name="offsetFromLabel" type="double"/>
-                  <Option value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale" type="QString"/>
-                  <Option value="MM" name="offsetFromLabelUnit" type="QString"/>
+                  <Option type="bool" name="drawToAllParts" value="false"/>
+                  <Option type="QString" name="enabled" value="0"/>
+                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -24296,60 +28369,60 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <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 value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="QString" name="QFieldSync/action" value="copy"/>
+          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
+          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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 scaleBasedVisibility="0" backgroundColor="#ffffff" direction="1" lineSizeType="MM" spacingUnit="MM" penColor="#000000" minimumSize="0" height="15" rotationOffset="270" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" showAxis="0" lineSizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" enabled="0" width="15" opacity="1" sizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" penWidth="0" labelPlacementMethod="XHeight" penAlpha="255" spacing="0">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
+          <fontProperties style="" italic="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <attribute field="" color="#000000" label="" colorOpacity="1"/>
           <axisSymbol>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="35,35,35,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0.26" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24380,9 +28453,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24390,28 +28463,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="2" placement="0" priority="0" showAll="1" obstacle="0" zIndex="0">
+      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -24420,8 +28493,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -24430,8 +28503,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 type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -24445,22 +28518,22 @@ 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="id" name="" index="0"/>
+        <alias field="table_set" name="" index="1"/>
+        <alias field="label" name="" index="2"/>
+        <alias field="races" name="" index="3"/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="table_set" expression=""/>
-        <default applyOnUpdate="0" field="label" expression=""/>
-        <default applyOnUpdate="0" field="races" expression=""/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="table_set" applyOnUpdate="0"/>
+        <default expression="" field="label" applyOnUpdate="0"/>
+        <default expression="" field="races" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="table_set" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="label" notnull_strength="0" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" field="races" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="table_set" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="label" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint field="races" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" desc="" exp=""/>
@@ -24472,13 +28545,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column hidden="0" name="id" type="field" width="-1"/>
-          <column hidden="1" type="actions" width="-1"/>
-          <column hidden="0" name="table_set" type="field" width="-1"/>
-          <column hidden="0" name="label" type="field" width="-1"/>
-          <column hidden="0" name="races" type="field" width="130"/>
+          <column type="field" name="id" width="-1" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" name="table_set" width="-1" hidden="0"/>
+          <column type="field" name="label" width="-1" hidden="0"/>
+          <column type="field" name="races" width="130" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24510,10 +28583,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -24553,7 +28626,8 @@ def my_form_open(dialog, layer, feature):
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-    <layer id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
+    <layer id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
+    <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -24722,7 +28796,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal overview</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -24884,278 +28958,308 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" name="name" type="QString"/>
+      <Option type="QString" name="name" value=""/>
       <Option name="properties"/>
-      <Option value="collection" name="type" type="QString"/>
+      <Option type="QString" name="type" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer expanded="0" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
+    <visibility-preset name="Access Routes" has-expanded-info="1">
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="All Routes">
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+    <visibility-preset has-checked-group-info="1" name="All Routes" has-expanded-info="1">
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default" expanded="1"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+      </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 id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+      </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="Start and Finish pages"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default"/>
+    <visibility-preset name="Ask Me" has-expanded-info="1">
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+    <visibility-preset name="Fencing" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
       <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="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </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 expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - inset">
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+    <visibility-preset name="Marshal map - inset" has-expanded-info="1">
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <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 expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - main">
-      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+    <visibility-preset name="Marshal map - main" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
         <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal overview">
-      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+    <visibility-preset has-checked-group-info="1" name="Marshal overview" has-expanded-info="1">
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
       <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 expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <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="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </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 expanded="1" visible="1" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" style="default"/>
-      <expanded-legend-nodes id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="0" id="water_tables20170921142016467" style="default"/>
+      <layer id="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default"/>
+      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
       <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer expanded="1" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default"/>
+      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
       <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="0"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Marshals"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="OSM data"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <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="OSM data"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Proposed Routes">
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+    <visibility-preset name="Proposed Routes" has-expanded-info="1">
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <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 expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <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="Start and Finish pages"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
-      <layer expanded="1" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer expanded="1" visible="1" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" style="default"/>
-      <expanded-legend-nodes id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
-      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+    <visibility-preset has-checked-group-info="1" name="Routes" has-expanded-info="1">
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default" expanded="1"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <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="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </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 expanded="1" visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" visible="0" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="0" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{ead1c5b2-1bdf-46f1-9a2d-4cfa2c6acb18}"/>
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default"/>
+      <layer id="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
       <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
@@ -25163,39 +29267,39 @@ def my_form_open(dialog, layer, feature):
         <checked-group-node id="OSM data"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
+        <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="OSM data"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+    <visibility-preset name="Start/Finish" has-expanded-info="1">
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default" expanded="1"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshal pages"/>
+        <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="Start and Finish pages"/>
-        <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -25222,31 +29326,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout units="mm" worldFileMap="" printResolution="144" name="Routes">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -25261,49 +29365,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -25318,59 +29422,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="9.44946,191.611,mm" zValue="9" visibility="1" blendMode="0" marginY="1" labelText="[%&quot;Distance&quot;%]" size="14.1764,7.471,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.44946,191.611,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.44946,191.611,mm" htmlState="0" size="14.1764,7.471,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[%&quot;Distance&quot;%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25385,65 +29489,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="24.2445,191.81,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="RACE ROUTE" size="29.2025,7.272,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" positionLock="true" groupUuid="" excludeFromExports="0" position="24.2445,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="0" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="24.2445,191.81,mm" htmlState="0" size="29.2025,7.272,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="RACE ROUTE" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25458,65 +29562,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.0" size="57.4836,6.8714,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" positionLock="true" groupUuid="" excludeFromExports="0" position="204.225,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25531,65 +29635,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 September 2020" size="51.6706,6.60801,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" positionLock="true" groupUuid="" excludeFromExports="0" position="210.038,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 September 2020" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25604,39 +29708,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" zValue="4" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="17.3653" northMode="0" blendMode="0" pictureHeight="17.4718" pictureRotation="0" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northOffset="0" size="29.7523,17.4718,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" positionLock="true" groupUuid="" excludeFromExports="0" position="262.196,188.218,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25644,42 +29748,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" zValue="3" visibility="1" shapeType="1" blendMode="0" size="251.959,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -25694,61 +29798,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" zValue="2" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="67.7828,166.874,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="true" opacity="1" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Routes" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
+        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
         <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>
@@ -25763,45 +29867,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -25832,44 +29936,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -25892,40 +29996,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -25940,29 +30044,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25972,43 +30076,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,9.08557,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="282.012,174.44,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="round" id="" type="65639" frame="true" opacity="1" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm" drawCanvasItems="false" background="true" followPresetName="Routes" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.44946,9.08557,mm" size="282.012,174.44,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" xmax="18.42303517425787263" ymin="-33.92999999999999972" ymax="-33.89719473757251222"/>
+        <Extent xmin="18.37000000000000099" ymax="-33.89719473757251222" xmax="18.42303517425787263" ymin="-33.92999999999999972"/>
         <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>
@@ -26023,45 +30127,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26092,44 +30196,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26152,40 +30256,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26200,29 +30304,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26232,60 +30336,60 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="QString"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="QString"/>
-          <Option value="1" name="pdfSimplify" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfAppendGeoreference" value="1"/>
+          <Option type="QString" name="pdfCreateGeoPdf" value="0"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
+          <Option type="QString" name="pdfExportThemes" value=""/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfOgcBestPracticeFormat" value="0"/>
+          <Option type="QString" name="pdfSimplify" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" hideCoverage="0" sortAscending="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr" pageNameExpression="&quot;Distance&quot;" filterFeatures="1"/>
+      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" coverageLayerName="all_routes" coverageLayerProvider="ogr" filterFeatures="1" sortFeatures="1" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshals">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -26300,49 +30404,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -26357,9 +30461,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26367,15 +30471,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="110.353,5.04491,mm" size="39.4312,46.1,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.1,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="true" splitLayer="0" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" frameJoinStyle="bevel" wmsLegendWidth="50" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="5" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="110.353,5.04491,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="128" green="128" blue="128"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.1,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="110.353,5.04491,mm" blendMode="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="39.4312,46.1,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" zValue="5" rasterBorder="1" groupUuid="" position="110.353,5.04491,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="bevel" title="" background="true">
+        <FrameColor alpha="255" blue="128" green="128" red="128"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26383,48 +30487,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
           </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Unchecked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" name="fencing">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="0,1,2" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="legend/node-order" value="0,1,2"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -26432,62 +30536,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="98.7828,149.027,mm" zValue="4" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="56.5192,54.5647,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="true" opacity="1" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="98.7828,149.027,mm" outlineWidthM="0.2,mm" drawCanvasItems="false" background="true" followPresetName="Marshal map - inset" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="98.7828,149.027,mm" size="56.5192,54.5647,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal map - inset" background="true" itemRotation="0" outlineWidthM="0.2,mm" zValue="4" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41064302246786966" xmax="18.41493455420295433" ymin="-33.90316824413850583" ymax="-33.89902512102636223"/>
+        <Extent xmin="18.41064302246786966" ymax="-33.89902512102636223" xmax="18.41493455420295433" ymin="-33.90316824413850583"/>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26518,44 +30622,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26578,40 +30682,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26626,29 +30730,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26656,28 +30760,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="1" show="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" inverted="0" name="Overview 1" blendMode="0">
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <ComposerMapOverview centered="1" position="3" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,65,170,127" 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="35,35,35,102" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,65,170,127"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,102"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -26692,9 +30796,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26702,9 +30806,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26714,67 +30818,67 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="3.53,6.0007,mm" zValue="3" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="142,187.018,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="3.53,6.0007,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="false" followPresetName="Marshal map - main" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="3.53,6.0007,mm" size="142,187.018,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal map - main" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41227535330844844" xmax="18.41330222336237554" ymin="-33.9017728906146445" ymax="-33.90042047455022356"/>
+        <Extent xmin="18.41227535330844844" ymax="-33.90042047455022356" xmax="18.41330222336237554" ymin="-33.9017728906146445"/>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26805,44 +30909,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26865,40 +30969,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26913,29 +31017,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26945,20 +31049,20 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="290.617,6.0007,mm" zValue="2" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" visibility="1" blendMode="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionY="0" size="142.117,187.018,mm" referencePoint="2" sectionWidth="142.117" frameJoinStyle="round" id="" sectionHeight="182.4" type="65647" frame="false" opacity="1" sectionX="0" hideBackgroundIfEmpty="0" hidePageIfEmpty="0" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionLock="true" groupUuid="" excludeFromExports="0" position="290.617,6.0007,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" itemRotation="0">
-        <FrameColor alpha="255" red="119" green="119" blue="119"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="290.617,6.0007,mm" size="142.117,187.018,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" opacity="1" blendMode="0" type="65647" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" sectionX="0" referencePoint="2" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" sectionWidth="142.117" sectionY="0" sectionHeight="182.4" positionLock="true" position="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hideBackgroundIfEmpty="0" hidePageIfEmpty="0" id="" frame="false">
+        <FrameColor alpha="255" blue="119" green="119" red="119"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26966,21 +31070,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="246.665,178.41,mm" zValue="1" resizeMode="0" anchorPoint="0" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="27.4317" northMode="0" blendMode="0" pictureHeight="27.6" pictureRotation="0" mapUuid="" northOffset="0" size="47.1065,27.6,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" groupUuid="" excludeFromExports="0" position="246.665,178.41,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="246.665,178.41,mm" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="0" outlineWidthM="0.3,mm" pictureHeight="27.6" zValue="1" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="246.665,178.41,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="27.4317">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26988,14 +31092,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" 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;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#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;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#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 Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&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;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" contentMode="1" stylesheetEnabled="true" url="" maxBreakDistance="12" type="65648" evaluateExpressions="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;}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true">
+      <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;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#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;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#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 Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&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;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" maxBreakDistance="12" type="65648" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" contentMode="1" resizeMode="0" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" 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 uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27005,53 +31109,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="0" name="imageCropMarginUnit" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="rasterize" type="QString"/>
-          <Option value="3.53" name="resizeToContentsBottomMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsLeftMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsRightMargin" type="QString"/>
-          <Option value="3.53" name="resizeToContentsTopMargin" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="jpg"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropMarginUnit" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="rasterize" value="false"/>
+          <Option type="QString" name="resizeToContentsBottomMargin" value="3.53"/>
+          <Option type="QString" name="resizeToContentsLeftMargin" value="3.53"/>
+          <Option type="QString" name="resizeToContentsRightMargin" value="3.53"/>
+          <Option type="QString" name="resizeToContentsTopMargin" value="3.53"/>
+          <Option type="QString" name="singleFile" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" hideCoverage="0" sortAscending="1" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" enabled="1" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortKey="position" coverageLayerProvider="ogr" pageNameExpression="&quot;position&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortAscending="1" coverageLayerName="marshal_positions" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="position" pageNameExpression="&quot;position&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -27066,49 +31170,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,420,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -27123,9 +31227,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27133,101 +31237,69 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="15.6525,12.5708,mm" size="21.6797,33,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="false" splitLayer="0" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="8" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="15.6525,12.5708,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="286.027,2,mm" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="0" outlineWidthM="0.3,mm" pictureHeight="7.97477" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="286.027,2,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderColor="0,0,0,255" mode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northMode="0" id="" frame="false" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
-          </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
-          </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-        </styles>
-        <layer-tree-group>
-          <customproperties>
-            <Option/>
-          </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
-            <customproperties>
-              <Option/>
-            </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
-              <customproperties>
-                <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-              </customproperties>
-            </layer-tree-layer>
-          </layer-tree-group>
-          <custom-order enabled="0"/>
-        </layer-tree-group>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,399.106,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="MARSHAL POSITIONS" size="45.1194,7.36972,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,399.106,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              </Option>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+      </LayoutItem>
+      <LayoutItem positionOnPage="285.027,205.886,mm" htmlState="0" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="270" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[%upper( &quot;area&quot; )%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27242,65 +31314,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,406.988,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="Page [% &quot;page&quot; %]" size="16.2476,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem lineCapStyle="square" maxBarWidth="150" type="65646" opacity="1" outlineWidthM="0.3,mm" unitType="meters" numSubdivisions="1" positionOnPage="7,189.669,mm" blendMode="0" minBarWidth="50" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" visibility="1" frame="false" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" style="Single Box" alignment="0" labelHorizontalPlacement="0" itemRotation="0" size="145.54,16.2165,mm" positionLock="true" unitLabel="m" referencePoint="0" labelVerticalPlacement="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" zValue="2" subdivisionsHeight="1.5" segmentMillimeters="26.3519" groupUuid="" position="7,189.669,mm" id="" numSegments="4" numUnitsPerSegment="100" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" lineJoinStyle="miter" segmentSizeMode="1" boxContentSpace="1" labelBarSpace="3" frameJoinStyle="miter" numSegmentsLeft="2" background="false" height="3" outlineWidth="0.3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27315,626 +31387,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="214.292,406.988,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.2" size="27.7839,7.51682,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" positionLock="true" groupUuid="" excludeFromExports="0" position="214.292,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="185.72,399.107,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="56.3557,7.36902,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" positionLock="true" groupUuid="" excludeFromExports="0" position="185.72,399.107,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="243.319,382.696,mm" zValue="3" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="31.1059" northMode="0" blendMode="0" pictureHeight="31.2967" pictureRotation="0" mapUuid="" northOffset="0" size="49.3143,31.2967,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" positionLock="true" groupUuid="" excludeFromExports="0" position="243.319,382.696,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.84321,406.626,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="236.083,0.14328,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-            <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <prop k="offset" v="0,0"/>
-            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="offset_unit" v="MM"/>
-            <prop k="outline_color" v="0,0,0,255"/>
-            <prop k="outline_style" v="solid"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.03,5.9483,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="286.94,392.396,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Marshal overview" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.4043547521658617" xmax="18.42124635930919041" ymin="-33.91857233280978789" ymax="-33.89547273009495854"/>
-        <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
-      </LayoutItem>
-      <customproperties>
-        <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-        </Option>
-      </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" filterFeatures="0"/>
-    </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
-      <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-            <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <prop k="offset" v="0,0"/>
-            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="offset_unit" v="MM"/>
-            <prop k="outline_color" v="0,0,0,255"/>
-            <prop k="outline_style" v="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="outline_color" v="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </LayoutItem>
-        <GuideCollection visible="1"/>
-      </PageCollection>
-      <LayoutItem positionOnPage="286.027,2,mm" zValue="4" resizeMode="0" anchorPoint="0" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="6.31767" northMode="0" blendMode="0" pictureHeight="7.97477" pictureRotation="330" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northOffset="0" size="9.45865,11,mm" referencePoint="0" frameJoinStyle="miter" mode="0" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="arrows/NorthArrow_11.svg" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" groupUuid="" excludeFromExports="0" position="286.027,2,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-      </LayoutItem>
-      <LayoutItem positionOnPage="285.027,205.886,mm" zValue="3" visibility="1" blendMode="0" marginY="1" labelText="[%upper( &quot;area&quot; )%]" size="142.543,10.3185,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" groupUuid="" excludeFromExports="0" position="285.027,205.886,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" itemRotation="270">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem subdivisionsHeight="1.5" minBarWidth="50" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" outlineWidth="0.3" id="" maxBarWidth="150" background="false" numMapUnitsPerScaleBarUnit="1" positionOnPage="7,189.669,mm" lineCapStyle="square" size="145.54,16.2165,mm" outlineWidthM="0.3,mm" segmentSizeMode="1" unitType="meters" groupUuid="" height="3" frame="false" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" visibility="1" frameJoinStyle="miter" labelBarSpace="3" numSegments="4" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" segmentMillimeters="26.3519" positionLock="true" unitLabel="m" numUnitsPerSegment="100" numSubdivisions="1" alignment="0" zValue="2" labelVerticalPlacement="0" style="Single Box" labelHorizontalPlacement="0" lineJoinStyle="miter" position="7,189.669,mm" numSegmentsLeft="2" referencePoint="0" itemRotation="0" boxContentSpace="1" opacity="1" blendMode="0" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-        <strokeColor alpha="255" red="0" green="0" blue="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" name="decimal_separator" type="QChar"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
-            <Option value="" name="thousand_separator" type="QChar"/>
+            <Option type="QChar" name="decimal_separator" value=""/>
+            <Option type="int" name="decimals" value="6"/>
+            <Option type="int" name="rounding_type" value="0"/>
+            <Option type="bool" name="show_plus" value="false"/>
+            <Option type="bool" name="show_thousand_separator" value="true"/>
+            <Option type="bool" name="show_trailing_zeros" value="false"/>
+            <Option type="QChar" name="thousand_separator" value=""/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" red="0" green="0" blue="0"/>
-        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.3"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -27965,52 +31486,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.3"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28041,52 +31562,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="miter" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.3" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.3"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28117,36 +31638,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -28161,36 +31682,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28205,87 +31726,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem positionOnPage="7,5.5,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="278.027,180.318,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="330" position="7,5.5,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="false" followPresetName="Start/Finish" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="7,5.5,mm" size="278.027,180.318,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Start/Finish" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="330" positionLock="true" position="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="rotation" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="field" value="rotation"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="id" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="id"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="angle"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" xmax="18.41790915398017958" ymin="-33.90494830469008747" ymax="-33.89880140828828559"/>
+        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="3" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="3" gridFrameStyle="0" intervalY="5" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="5" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="3" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" position="3" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="5" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="1" intervalY="5" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="3" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="4" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="195,195,195,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -28316,44 +31837,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -28376,9 +31897,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -28395,32 +31916,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -28435,29 +31956,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28467,63 +31988,63 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
-          <Option value="0" name="svgCropMarginBottom" type="QString"/>
-          <Option value="0" name="svgCropMarginLeft" type="QString"/>
-          <Option value="0" name="svgCropMarginRight" type="QString"/>
-          <Option value="0" name="svgCropMarginTop" type="QString"/>
-          <Option value="true" name="svgCropToContents" type="QString"/>
-          <Option value="0" name="svgDisableRasterTiles" type="QString"/>
-          <Option value="false" name="svgGroupLayers" type="QString"/>
-          <Option value="1" name="svgIncludeMetadata" type="QString"/>
-          <Option value="0" name="svgTextFormat" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="true"/>
+          <Option type="QString" name="svgCropMarginBottom" value="0"/>
+          <Option type="QString" name="svgCropMarginLeft" value="0"/>
+          <Option type="QString" name="svgCropMarginRight" value="0"/>
+          <Option type="QString" name="svgCropMarginTop" value="0"/>
+          <Option type="QString" name="svgCropToContents" value="true"/>
+          <Option type="QString" name="svgDisableRasterTiles" value="0"/>
+          <Option type="QString" name="svgGroupLayers" value="false"/>
+          <Option type="QString" name="svgIncludeMetadata" value="1"/>
+          <Option type="QString" name="svgTextFormat" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="start_finish_area" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortKey="area" coverageLayerProvider="ogr" pageNameExpression="&quot;area&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortAscending="1" coverageLayerName="start_finish_area" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="area" pageNameExpression="&quot;area&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="300" name="Fencing">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -28538,49 +32059,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28595,9 +32116,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28605,47 +32126,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionOnPage="6.76779,190.27,mm" zValue="11" visibility="1" blendMode="0" marginY="1" labelText="FENCING: [% &quot;name&quot; %]" size="148.46,7.36972,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" groupUuid="" excludeFromExports="0" position="6.76779,190.27,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="6.76779,190.27,mm" htmlState="0" size="148.46,7.36972,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="11" referencePoint="0" excludeFromExports="0" visibility="1" labelText="FENCING: [% &quot;name&quot; %]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28660,65 +32181,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="211.295,197.64,mm" zValue="10" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.0" size="27.7839,7.51682,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" groupUuid="" excludeFromExports="0" position="211.295,197.64,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="211.295,197.64,mm" htmlState="0" size="27.7839,7.51682,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="10" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28733,65 +32254,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="115.637,198.083,mm" zValue="9" visibility="1" blendMode="0" marginY="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" size="67.0856,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" groupUuid="" excludeFromExports="0" position="115.637,198.083,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="115.637,198.083,mm" htmlState="0" size="67.0856,7.80192,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28806,65 +32327,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="59.5581,198.083,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" size="53.0017,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" groupUuid="" excludeFromExports="0" position="59.5581,198.083,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="59.5581,198.083,mm" htmlState="0" size="53.0017,7.80192,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28879,65 +32400,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.76779,198.083,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="Page [% @atlas_featurenumber %]" size="52.7903,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" groupUuid="" excludeFromExports="0" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="6.76779,198.083,mm" htmlState="0" size="52.7903,7.80192,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Page [% @atlas_featurenumber %]" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28952,39 +32473,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="243.098,175.353,mm" zValue="6" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="29.6535" northMode="0" blendMode="0" pictureHeight="29.8354" pictureRotation="0" mapUuid="" northOffset="0" size="49.3143,29.8354,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" groupUuid="" excludeFromExports="0" position="243.098,175.353,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="243.098,175.353,mm" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="29.8354" zValue="6" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="243.098,175.353,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="29.6535">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28992,47 +32513,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="182.723,190.271,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 September 2020" size="56.3557,7.36902,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" groupUuid="" excludeFromExports="0" position="182.723,190.271,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="182.723,190.271,mm" htmlState="0" size="56.3557,7.36902,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 September 2020" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29047,60 +32568,60 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.91779,197.79,mm" zValue="4" visibility="1" shapeType="1" blendMode="0" size="232.01,0.14328,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" groupUuid="" excludeFromExports="0" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="6.91779,197.79,mm" size="232.01,0.14328,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -29115,55 +32636,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem subdivisionsHeight="1.5" minBarWidth="25" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" outlineWidth="0.2" id="" maxBarWidth="100" background="false" numMapUnitsPerScaleBarUnit="1" positionOnPage="6.76779,2.8482,mm" lineCapStyle="square" size="95.0404,15.8378,mm" outlineWidthM="0.3,mm" segmentSizeMode="1" unitType="meters" groupUuid="" height="2" frame="false" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" visibility="1" frameJoinStyle="miter" labelBarSpace="1" numSegments="2" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" segmentMillimeters="28.4264" positionLock="true" unitLabel="m" numUnitsPerSegment="10" numSubdivisions="1" alignment="0" zValue="3" labelVerticalPlacement="0" style="Double Box" labelHorizontalPlacement="0" lineJoinStyle="round" position="6.76779,2.8482,mm" numSegmentsLeft="2" referencePoint="0" itemRotation="0" boxContentSpace="0.2" opacity="1" blendMode="0" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem lineCapStyle="square" maxBarWidth="100" type="65646" opacity="1" outlineWidthM="0.3,mm" unitType="meters" numSubdivisions="1" positionOnPage="6.76779,2.8482,mm" blendMode="0" minBarWidth="25" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" visibility="1" frame="false" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" style="Double Box" alignment="0" labelHorizontalPlacement="0" itemRotation="0" size="95.0404,15.8378,mm" positionLock="true" unitLabel="m" referencePoint="0" labelVerticalPlacement="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" zValue="3" subdivisionsHeight="1.5" segmentMillimeters="28.4264" groupUuid="" position="6.76779,2.8482,mm" id="" numSegments="2" numUnitsPerSegment="10" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" lineJoinStyle="round" segmentSizeMode="1" boxContentSpace="0.2" labelBarSpace="1" frameJoinStyle="miter" numSegmentsLeft="2" background="false" height="2" outlineWidth="0.2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29178,75 +32699,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" red="0" green="0" blue="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" name="decimal_separator" type="QChar"/>
-            <Option value="6" name="decimals" type="int"/>
-            <Option value="0" name="rounding_type" type="int"/>
-            <Option value="false" name="show_plus" type="bool"/>
-            <Option value="true" name="show_thousand_separator" type="bool"/>
-            <Option value="false" name="show_trailing_zeros" type="bool"/>
-            <Option value="" name="thousand_separator" type="QChar"/>
+            <Option type="QChar" name="decimal_separator" value=""/>
+            <Option type="int" name="decimals" value="6"/>
+            <Option type="int" name="rounding_type" value="0"/>
+            <Option type="bool" name="show_plus" value="false"/>
+            <Option type="bool" name="show_thousand_separator" value="true"/>
+            <Option type="bool" name="show_trailing_zeros" value="false"/>
+            <Option type="QChar" name="thousand_separator" value=""/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" red="0" green="0" blue="0"/>
-        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.2"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29277,52 +32798,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.2"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29353,52 +32874,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
               <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="round" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.2" 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 type="QString" name="align_dash_pattern" value="0"/>
+                <Option type="QString" name="capstyle" value="square"/>
+                <Option type="QString" name="customdash" value="5;2"/>
+                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="customdash_unit" value="MM"/>
+                <Option type="QString" name="dash_pattern_offset" value="0"/>
+                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                <Option type="QString" name="draw_inside_polygon" value="0"/>
+                <Option type="QString" name="joinstyle" value="round"/>
+                <Option type="QString" name="line_color" value="0,0,0,255"/>
+                <Option type="QString" name="line_style" value="solid"/>
+                <Option type="QString" name="line_width" value="0.2"/>
+                <Option type="QString" name="line_width_unit" value="MM"/>
+                <Option type="QString" name="offset" value="0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29429,36 +32950,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="0,0,0,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -29473,36 +32994,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29517,24 +33038,24 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="256.808,2.9982,mm" size="38.1563,54.9504,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="true" splitLayer="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" resizeToContents="0" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="2" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="256.808,2.9982,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="0" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="256.808,2.9982,mm" blendMode="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="38.1563,54.9504,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" zValue="2" rasterBorder="1" groupUuid="" position="256.808,2.9982,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter" title="" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29542,52 +33063,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" style="Bold"/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="Bold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="group" marginTop="3">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="3">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2.5">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones" groupLayer="">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" name="fencing">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option type="QString" name="legend/expressionFilter" value=""/>
+                  <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29595,44 +33116,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.76779,9.35102,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="283.418,180.92,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="0.9" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="false" followPresetName="Fencing" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="6.76779,9.35102,mm" size="283.418,180.92,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Fencing" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option value="1" name="exponent" type="double"/>
-                      <Option value="360" name="maxOutput" type="double"/>
-                      <Option value="0" name="maxValue" type="double"/>
-                      <Option value="0" name="minOutput" type="double"/>
-                      <Option value="0" name="minValue" type="double"/>
-                      <Option value="0" name="nullOutput" type="double"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapRotation">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option type="double" name="exponent" value="1"/>
+                      <Option type="double" name="maxOutput" value="360"/>
+                      <Option type="double" name="maxValue" value="0"/>
+                      <Option type="double" name="minOutput" value="0"/>
+                      <Option type="double" name="minValue" value="0"/>
+                      <Option type="double" name="nullOutput" value="0"/>
                     </Option>
-                    <Option value="0" name="t" type="int"/>
+                    <Option type="int" name="t" value="0"/>
                   </Option>
-                  <Option value="3" name="type" type="int"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="angle" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedRotation">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value="angle"/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41635400827248503" xmax="18.4172496509604926" ymin="-33.90421228789515595" ymax="-33.90364055490629625"/>
+        <Extent xmin="18.41635400827248503" ymax="-33.90364055490629625" xmax="18.4172496509604926" ymin="-33.90421228789515595"/>
         <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>
@@ -29647,45 +33168,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="3" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="3" gridFrameStyle="0" intervalY="5" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="5" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="3" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" position="3" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="5" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="1" intervalY="5" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="3" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="4" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="195,195,195,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="195,195,195,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29716,44 +33237,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29776,9 +33297,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29795,32 +33316,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -29835,29 +33356,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29867,60 +33388,60 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="QString"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="QString"/>
-          <Option value="1" name="pdfSimplify" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="rasterize" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfAppendGeoreference" value="1"/>
+          <Option type="QString" name="pdfCreateGeoPdf" value="0"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
+          <Option type="QString" name="pdfExportThemes" value=""/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfOgcBestPracticeFormat" value="0"/>
+          <Option type="QString" name="pdfSimplify" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="rasterize" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" sortFeatures="1" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="fence_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortKey="group" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortAscending="1" coverageLayerName="fence_groups" coverageLayerProvider="virtual" filterFeatures="0" sortFeatures="1" sortKey="group" pageNameExpression="&quot;name&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" name="Ask Me">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="9" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="9" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -29935,49 +33456,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29992,59 +33513,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="4.43449,186.634,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="Directions to Start of Race" size="83.9998,10.4638,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" groupUuid="" excludeFromExports="0" position="4.43449,186.634,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="4.43449,186.634,mm" htmlState="0" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Directions to Start of Race" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="false" position="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30059,65 +33580,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.43449,197.498,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="Gun Run" size="48.2923,9.511,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" groupUuid="" excludeFromExports="0" position="4.43449,197.498,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="4.43449,197.498,mm" htmlState="0" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Gun Run" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="false" position="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30132,33 +33653,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem columnSpace="0" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="10.096,10.8563,mm" size="59.0766,76,mm" title="" rasterBorder="1" symbolWidth="9" outlineWidthM="0.3,mm" equalColumnWidth="0" titleAlignment="1" symbolHeight="5" fontColor="#000000" groupUuid="" frame="true" legendFilterByMap="1" splitLayer="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" frameJoinStyle="round" wmsLegendWidth="50" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" resizeToContents="1" symbolAlignment="1" positionLock="false" rasterBorderColor="0,0,0,255" wrapChar="" zValue="6" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="10.096,10.8563,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="2" excludeFromExports="0">
-        <FrameColor alpha="255" red="139" green="139" blue="139"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="5" columnSpace="0" positionOnPage="10.096,10.8563,mm" blendMode="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="59.0766,76,mm" positionLock="false" referencePoint="0" symbolAlignment="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" zValue="6" rasterBorder="1" groupUuid="" position="10.096,10.8563,mm" id="" lineSpacing="2" symbolWidth="9" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="round" title="" legendFilterByMap="1" background="true">
+        <FrameColor alpha="255" blue="139" green="139" red="139"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30166,52 +33687,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2.5">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="3" indent="0" name="symbolLabel" marginTop="2.5">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" marginLeft="3" name="symbolLabel" indent="0" marginTop="2.5">
+            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Ask Me" groupLayer="">
+          <layer-tree-group name="Ask Me" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" name="legend/title-style" type="QString"/>
+                <Option type="QString" name="legend/title-style" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" checked="Qt::Checked" name="poi_labels">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" source="./poi_labels.shp|layername=poi_labels" legend_exp="" name="poi_labels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" name="legend/label-0" type="QString"/>
-                  <Option value="Toilets" name="legend/label-1" type="QString"/>
-                  <Option value="Tog Bag Drop-off" name="legend/label-2" type="QString"/>
-                  <Option value="Road Closed to Cars" name="legend/label-3" type="QString"/>
-                  <Option value="MyCiti Drop-off" name="legend/label-4" type="QString"/>
-                  <Option value="Parking" name="legend/label-5" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="legend/label-0" value="Start/Finish"/>
+                  <Option type="QString" name="legend/label-1" value="Toilets"/>
+                  <Option type="QString" name="legend/label-2" value="Tog Bag Drop-off"/>
+                  <Option type="QString" name="legend/label-3" value="Road Closed to Cars"/>
+                  <Option type="QString" name="legend/label-4" value="MyCiti Drop-off"/>
+                  <Option type="QString" name="legend/label-5" value="Parking"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" checked="Qt::Checked" name="directions_to_start">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" name="directions_to_start" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
-                  <Option value="To 10KM Start (07:30)" name="legend/label-1" type="QString"/>
-                  <Option value="To 5KM Start (08:30)" name="legend/label-2" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="QString" name="legend/label-0" value="To 21KM Start (06:30)"/>
+                  <Option type="QString" name="legend/label-1" value="To 10KM Start (07:30)"/>
+                  <Option type="QString" name="legend/label-2" value="To 5KM Start (08:30)"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30219,47 +33740,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="221.862,190.027,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.0" size="27.7839,6.871,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" groupUuid="" excludeFromExports="0" position="221.862,190.027,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="221.862,190.027,mm" htmlState="0" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="false" position="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30274,65 +33795,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="197.975,197.498,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" groupUuid="" excludeFromExports="0" position="197.975,197.498,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="197.975,197.498,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="false" position="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30347,39 +33868,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="249.646,179.724,mm" zValue="3" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="24.2337" northMode="0" blendMode="0" pictureHeight="24.3824" pictureRotation="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northOffset="0" size="42.9838,24.3824,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" groupUuid="" excludeFromExports="0" position="249.646,179.724,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="249.646,179.724,mm" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="24.3824" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="249.646,179.724,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="24.2337">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30387,42 +33908,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.58449,197.248,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="244.912,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" groupUuid="" excludeFromExports="0" position="4.58449,197.248,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="4.58449,197.248,mm" size="244.912,0.1,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -30437,46 +33958,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.43449,6.411,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="288.007,183.616,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" groupUuid="" excludeFromExports="0" mapRotation="0" position="4.43449,6.411,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Ask Me" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="4.43449,6.411,mm" size="288.007,183.616,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Ask Me" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="false" position="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" xmax="18.41789384089274151" ymin="-33.90994364588821952" ymax="-33.8970204297764468"/>
+        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" xmax="18.41789384089274151" ymin="-33.90994364588821952"/>
         <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>
@@ -30491,45 +34012,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30560,44 +34081,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30620,40 +34141,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30668,29 +34189,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30700,54 +34221,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="" sortFeatures="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" pageNameExpression="" filterFeatures="0"/>
+      <Atlas coverageLayer="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" sortFeatures="0" pageNameExpression="" enabled="0"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="144" name="All Routes">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="All Routes" units="mm" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30762,49 +34283,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30819,59 +34340,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="200.171,199.082,mm" zValue="13" visibility="1" blendMode="0" marginY="1" labelText="REVISION 2.4" size="61.5373,6.8714,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" groupUuid="" excludeFromExports="0" position="200.171,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="200.171,199.082,mm" htmlState="0" size="61.5373,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="13" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 2.5" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30886,65 +34407,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.7863,192.073,mm" zValue="12" visibility="1" blendMode="0" marginY="1" labelText="Gun Run 2022: [%&quot;Source&quot;%]" size="61.5373,6.60801,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.7863,192.073,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.7863,192.073,mm" htmlState="0" size="61.5373,6.60801,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="12" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Gun Run 2022: [%&quot;Source&quot;%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30959,65 +34480,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.7863,199.082,mm" zValue="11" visibility="1" blendMode="0" marginY="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" size="61.5373,6.60801,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.7863,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.7863,199.082,mm" htmlState="0" size="61.5373,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="11" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31032,39 +34553,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" zValue="10" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="29.7523" northMode="0" blendMode="0" pictureHeight="15.9472" pictureRotation="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" northOffset="0" size="29.7523,17.4718,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../GunRun2022_250.png" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" groupUuid="" excludeFromExports="0" position="262.196,188.218,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="15.9472" zValue="10" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" northMode="0" id="" frame="false" file="../GunRun2022_250.png" pictureWidth="29.7523">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31072,42 +34593,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.57644,198.832,mm" zValue="9" visibility="1" shapeType="1" blendMode="0" size="251.982,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.57644,198.832,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.57644,198.832,mm" size="251.982,0.1,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31122,321 +34643,321 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.57644,5.42566,mm" zValue="8" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="107.861,186.385,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Trail Finish" type="65639" frame="true" opacity="1" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.57644,5.42566,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.57644,5.42566,mm" size="107.861,186.385,mm" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="9.57644,5.42566,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" mapFlags="0" id="Trail Finish" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" xmax="18.41187375074135701" ymin="-33.93243205975926458" ymax="-33.90007566747966905"/>
+        <Extent xmin="18.39314911415855391" ymax="-33.90007566747966905" xmax="18.41187375074135701" ymin="-33.93243205975926458"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="112.643,4.09761,mm" zValue="7" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="179.156,189.279,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Trail Start" type="65639" frame="true" opacity="1" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="112.643,4.09761,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="112.643,4.09761,mm" size="179.156,189.279,mm" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="112.643,4.09761,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" mapFlags="0" id="Trail Start" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" xmax="18.42354248737832023" ymin="-33.95772328900195447" ymax="-33.92484901666441743"/>
+        <Extent xmin="18.3924263991010406" ymax="-33.92484901666441743" xmax="18.42354248737832023" ymin="-33.95772328900195447"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" zValue="6" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="67.7828,166.874,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Left inset 21KM" type="65639" frame="true" opacity="1" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Routes" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" id="Left inset 21KM" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" xmax="18.38626092146919788" ymin="-33.94700000000000273" ymax="-33.91681492292400435"/>
+        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="126.141,118.975,mm" zValue="5" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="113.3,76.1023,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Bottom inset 21KM" type="65639" frame="true" opacity="1" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="126.141,118.975,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" itemRotation="0">
-        <FrameColor alpha="255" red="103" green="34" blue="144"/>
-        <BackgroundColor alpha="255" red="200" green="175" blue="215"/>
+      <LayoutItem positionOnPage="126.141,118.975,mm" size="113.3,76.1023,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="126.141,118.975,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" id="Bottom inset 21KM" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="144" green="34" red="103"/>
+        <BackgroundColor alpha="255" blue="215" green="175" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" xmax="18.42329132157224336" ymin="-33.9168317482614512" ymax="-33.91132718340826813"/>
+        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
         <LayerSet/>
         <AtlasMap scalingMode="0" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="19.6693,7.89412,mm" zValue="4" visibility="0" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="68.3676,117.12,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="End inset Trail" type="65639" frame="true" opacity="1" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="19.6693,7.89412,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="19.6693,7.89412,mm" size="68.3676,117.12,mm" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="19.6693,7.89412,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" mapFlags="0" id="End inset Trail" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" xmax="18.41240136424316276" ymin="-33.91454383501641701" ymax="-33.90099106513847005"/>
+        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" xmax="18.41240136424316276" ymin="-33.91454383501641701"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="170.062,49.6297,mm" zValue="3" visibility="0" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="63.655,88.3012,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Start inset Trail" type="65639" frame="true" opacity="1" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="170.062,49.6297,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="170.062,49.6297,mm" size="63.655,88.3012,mm" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="170.062,49.6297,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" mapFlags="0" id="Start inset Trail" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41445559427620893" xmax="18.4185691326545431" ymin="-33.94823764719958348" ymax="-33.94253141264477591"/>
+        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" xmax="18.4185691326545431" ymin="-33.94823764719958348"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="200.321,125.314,mm" zValue="2" visibility="0" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="75.8756,69.7635,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="Contour inset Trail" type="65639" frame="true" opacity="1" uuid="{917a530c-14f4-4ed8-b109-961939435221}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="200.321,125.314,mm" outlineWidthM="0.3,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="200.321,125.314,mm" size="75.8756,69.7635,mm" uuid="{917a530c-14f4-4ed8-b109-961939435221}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="200.321,125.314,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" mapFlags="0" id="Contour inset Trail" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41234259163472942" xmax="18.42332635419156972" ymin="-33.95702588572736147" ymax="-33.94692690566557047"/>
+        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" xmax="18.42332635419156972" ymin="-33.95702588572736147"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.50144,5.50066,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="282.372,186.234,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="round" id="Main Map" type="65639" frame="true" opacity="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.50144,5.50066,mm" outlineWidthM="0.15,mm" drawCanvasItems="true" background="true" followPresetName="Routes" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.50144,5.50066,mm" size="282.372,186.234,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" id="Main Map" frame="true" drawCanvasItems="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3985'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3985'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36400000000000077" xmax="18.4538899796794631" ymin="-33.95900000000000318" ymax="-33.89971434483381074"/>
+        <Extent xmin="18.36400000000000077" ymax="-33.89971434483385337" xmax="18.4538899796794631" ymin="-33.95900000000000318"/>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31467,44 +34988,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31527,40 +35048,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31575,29 +35096,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31605,34 +35126,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="0" show="1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" inverted="0" name="Overview 1" blendMode="0">
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <ComposerMapOverview centered="0" position="3" name="Overview 1" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties" type="Map">
-                  <Option name="alpha" type="Map">
-                    <Option value="true" name="active" type="bool"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression" type="QString"/>
-                    <Option value="3" name="type" type="int"/>
+                <Option type="QString" name="name" value=""/>
+                <Option type="Map" name="properties">
+                  <Option type="Map" name="alpha">
+                    <Option type="bool" name="active" value="true"/>
+                    <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                    <Option type="int" name="type" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="103,34,144,26" 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="103,34,144,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="103,34,144,26"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="103,34,144,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="103,34,144,26"/>
@@ -31647,9 +35168,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31657,9 +35178,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31669,61 +35190,61 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <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_cbaea960_3348_4aea_b155_46e5d310f792~~~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~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="int" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="int" name="pdfAppendGeoreference" value="1"/>
+          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
+          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfExportThemes" value=""/>
+          <Option type="int" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfLayerOrder" 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_cbaea960_3348_4aea_b155_46e5d310f792~~~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~~~route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
+          <Option type="int" name="pdfLosslessImages" value="0"/>
+          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
+          <Option type="int" name="pdfSimplify" value="1"/>
+          <Option type="int" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" hideCoverage="0" sortAscending="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr" pageNameExpression="&quot;Distance&quot;" filterFeatures="1"/>
+      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" coverageLayerName="all_routes" coverageLayerProvider="ogr" filterFeatures="1" sortFeatures="1" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan A1">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31738,49 +35259,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="594,841,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31795,9 +35316,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31805,15 +35326,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="25.5925,18.7971,mm" size="4,4,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="false" splitLayer="0" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="8" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="25.5925,18.7971,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="25.5925,18.7971,mm" blendMode="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" fontColor="#000000" wrapChar="" frame="false" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="4,4,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" zValue="8" rasterBorder="1" groupUuid="" position="25.5925,18.7971,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter" title="" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31821,37 +35342,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" legend_exp="" id="all_routes20170907054841602" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="QString"/>
+                  <Option type="QString" name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option type="QString" name="showFeatureCount" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31859,47 +35380,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.2963,808.939,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="MARSHAL POSITIONS" size="91.9494,15.0649,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.2963,808.939,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.2963,808.939,mm" htmlState="0" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31914,65 +35435,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="430.403,825.052,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.2" size="56.6212,15.3656,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" groupUuid="" excludeFromExports="0" position="430.403,825.052,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="430.403,825.052,mm" htmlState="0" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.2" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31987,65 +35508,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="372.175,808.942,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="114.848,15.0635,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" groupUuid="" excludeFromExports="0" position="372.175,808.942,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="372.175,808.942,mm" htmlState="0" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32060,39 +35581,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="489.557,775.395,mm" zValue="3" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="63.5856" northMode="0" blendMode="0" pictureHeight="63.9757" pictureRotation="0" mapUuid="" northOffset="0" size="100.498,63.9757,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" groupUuid="" excludeFromExports="0" position="489.557,775.395,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="489.557,775.395,mm" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="63.9757" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="489.557,775.395,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="63.5856">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32100,42 +35621,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.4463,824.155,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="481.428,0.606138,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.4463,824.155,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.4463,824.155,mm" size="481.428,0.606138,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32150,90 +35671,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="3.94474,5.25965,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="584.759,811.213,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="true" opacity="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="3.94474,5.25965,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Marshal overview" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="3.94474,5.25965,mm" size="584.759,811.213,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal overview" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" xmax="18.42299397558693741" ymin="-33.95821655848814657" ymax="-33.89072661913806428"/>
+        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="complete_marshal_overview" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortKey="page" coverageLayerProvider="virtual" pageNameExpression="&quot;page&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortAscending="1" coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" filterFeatures="0" sortFeatures="1" sortKey="page" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="144" name="Access Roads">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32248,49 +35769,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32305,27 +35826,27 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="244.484,130.172,mm" size="34.45,40.8,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="0" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="true" splitLayer="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="15" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="244.484,130.172,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="185" red="255" green="255" blue="255"/>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="244.484,130.172,mm" blendMode="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="34.45,40.8,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" zValue="15" rasterBorder="1" groupUuid="" position="244.484,130.172,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="0" frameJoinStyle="miter" title="" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32333,35 +35854,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="group" marginTop="3">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0" marginTop="3">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="3">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="3">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2.5">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Residents Access" groupLayer="">
+          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" checked="Qt::Checked" name="residents_access_roads">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" name="residents_access_roads" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32369,47 +35890,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.37446,191.81,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="ACCESS ROUTES FOR RESIDENTS" size="194.851,7.272,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.37446,191.81,mm" htmlState="0" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="ACCESS ROUTES FOR RESIDENTS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32424,65 +35945,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.1" size="57.4836,6.8714,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" groupUuid="" excludeFromExports="0" position="204.225,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32497,65 +36018,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" groupUuid="" excludeFromExports="0" position="210.038,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32570,39 +36091,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" zValue="4" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="17.3653" northMode="0" blendMode="0" pictureHeight="17.4718" pictureRotation="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" northOffset="0" size="29.7523,17.4718,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" groupUuid="" excludeFromExports="0" position="262.196,188.218,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32610,42 +36131,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" zValue="3" visibility="1" shapeType="1" blendMode="0" size="251.959,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32660,61 +36181,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" zValue="2" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="67.7828,166.874,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="true" opacity="1" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Access Routes" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Access Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMax">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="1" name="type" type="int"/>
-                  <Option value="" name="val" type="QString"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="int" name="type" value="1"/>
+                  <Option type="QString" name="val" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
+        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
         <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>
@@ -32729,45 +36250,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -32798,44 +36319,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -32858,40 +36379,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -32906,29 +36427,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32938,43 +36459,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,9.08557,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="282.012,175.592,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="round" id="" type="65639" frame="true" opacity="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm" drawCanvasItems="false" background="true" followPresetName="Access Routes" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.44946,9.08557,mm" size="282.012,175.592,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Access Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" xmax="18.42303507276415431" ymin="-33.92999999999999972" ymax="-33.89697816224119009"/>
+        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" xmax="18.42303507276415431" ymin="-33.92999999999999972"/>
         <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>
@@ -32989,45 +36510,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33058,44 +36579,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33118,40 +36639,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33166,29 +36687,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33198,54 +36719,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="1" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" enabled="1"/>
     </Layout>
-    <Layout units="mm" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" name="Golf Course Access">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33260,49 +36781,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,210,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33317,59 +36838,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" position="0" units="mm" page="0"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="9.37446,191.81,mm" zValue="8" visibility="1" blendMode="0" marginY="1" labelText="Access to P9 Parking and VIP Tent" size="194.851,7.272,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.37446,191.81,mm" htmlState="0" size="194.851,7.272,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Access to P9 Parking and VIP Tent" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="14" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33384,65 +36905,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="REVISION 1.0" size="57.4836,6.8714,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" groupUuid="" excludeFromExports="0" position="204.225,191.81,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33457,65 +36978,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" groupUuid="" excludeFromExports="0" position="210.038,199.082,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginX="1" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33530,39 +37051,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" zValue="4" resizeMode="0" anchorPoint="4" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="17.3653" northMode="0" blendMode="0" pictureHeight="17.4718" pictureRotation="0" mapUuid="" northOffset="0" size="29.7523,17.4718,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../Gun_Run_Logo.png" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" groupUuid="" excludeFromExports="0" position="262.196,188.218,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33570,42 +37091,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" zValue="3" visibility="1" shapeType="1" blendMode="0" size="251.959,0.1,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" groupUuid="" excludeFromExports="0" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33620,46 +37141,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,7.25098,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="false" mapFlags="0" size="282.012,182.649,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="round" id="" type="65639" frame="false" opacity="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionLock="false" groupUuid="" excludeFromExports="0" mapRotation="0" position="9.44946,7.25098,mm" outlineWidthM="0.15,mm" drawCanvasItems="false" background="true" followPresetName="" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="9.44946,7.25098,mm" size="282.012,182.649,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="false" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="false" position="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <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" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" 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 type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" xmax="18.40919746780259914" ymin="-33.90848231674397084" ymax="-33.90319854486631357"/>
+        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" xmax="18.40919746780259914" ymin="-33.90848231674397084"/>
         <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>
@@ -33674,45 +37195,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid leftFrameDivisions="0" frameFillColor2="0,0,0,255" rightAnnotationDisplay="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" gridFrameSideFlags="15" leftAnnotationDisplay="0" gridFrameStyle="0" intervalY="0" rotatedAnnotationsMinimumAngle="0" topAnnotationPosition="1" intervalX="0" rotatedTicksLengthMode="0" showAnnotation="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" bottomFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" maximumIntervalWidth="100" gridStyle="0" minimumIntervalWidth="50" offsetY="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" bottomAnnotationDisplay="0" show="0" rightFrameDivisions="0" gridFrameWidth="2" annotationExpression="" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" position="3" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" offsetX="0" rotatedAnnotationsLengthMode="0" gridFramePenColor="0,0,0,255" topFrameDivisions="0" name="Grid 1" frameAnnotationDistance="1" blendMode="0" annotationPrecision="3" topAnnotationDirection="0" gridFrameMargin="0" rightAnnotationPosition="1">
+        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
           <lineStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="line" is_animated="0">
+            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
                 <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="0,0,0,255" name="line_color" type="QString"/>
-                  <Option value="solid" name="line_style" type="QString"/>
-                  <Option value="0" 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 type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="0,0,0,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33743,44 +37264,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="marker" is_animated="0">
+            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
+              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="0" name="angle" type="QString"/>
-                  <Option value="square" name="cap_style" type="QString"/>
-                  <Option value="0,0,0,255" name="color" type="QString"/>
-                  <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                  <Option value="bevel" name="joinstyle" type="QString"/>
-                  <Option value="circle" 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="0,0,0,255" name="outline_color" type="QString"/>
-                  <Option value="solid" name="outline_style" type="QString"/>
-                  <Option value="0" 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="2" 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 type="QString" name="angle" value="0"/>
+                  <Option type="QString" name="cap_style" value="square"/>
+                  <Option type="QString" name="color" value="0,0,0,255"/>
+                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="name" value="circle"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
+                  <Option type="QString" name="outline_style" value="solid"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="scale_method" value="diameter"/>
+                  <Option type="QString" name="size" value="2"/>
+                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="size_unit" value="MM"/>
+                  <Option type="QString" name="vertical_anchor_point" value="1"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33803,40 +37324,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="10" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
             <families/>
-            <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-            <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-              <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                    <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                    <Option value="no" name="outline_style" type="QString"/>
-                    <Option value="0" name="outline_width" type="QString"/>
-                    <Option value="MM" name="outline_width_unit" type="QString"/>
-                    <Option value="solid" name="style" type="QString"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33851,29 +37372,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33883,54 +37404,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="QString" name="forceVector" value="0"/>
+          <Option type="QString" name="imageAntialias" value="true"/>
+          <Option type="QString" name="imageCropMarginBottom" value="0"/>
+          <Option type="QString" name="imageCropMarginLeft" value="0"/>
+          <Option type="QString" name="imageCropMarginRight" value="0"/>
+          <Option type="QString" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropToContents" value="false"/>
+          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option type="QString" name="singleFile" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="0" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" filterFeatures="0"/>
+      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" enabled="0"/>
     </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan Day 1">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
+    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
+      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
+      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="255,255,255,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="no"/>
+              <Option type="QString" name="outline_width" value="0.26"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33945,49 +37466,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,420,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutItem positionOnPage="0,0,mm" size="297,420,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" frame="false">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="miter"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0.26"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34002,9 +37523,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34012,15 +37533,88 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="15.6525,12.5708,mm" size="21.6797,33,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="false" splitLayer="0" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="8" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="15.6525,12.5708,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="112.086,406.476,mm" htmlState="1" size="23.5967,8.3142,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="14" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Page [% &quot;page&quot; %] " groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="112.086,406.476,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" marginX="0" halign="4" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <families/>
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <Option type="Map">
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
+                </Option>
+                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="color" v="255,255,255,255"/>
+                <prop k="joinstyle" v="bevel"/>
+                <prop k="offset" v="0,0"/>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <prop k="offset_unit" v="MM"/>
+                <prop k="outline_color" v="128,128,128,255"/>
+                <prop k="outline_style" v="no"/>
+                <prop k="outline_width" v="0"/>
+                <prop k="outline_width_unit" v="MM"/>
+                <prop k="style" v="solid"/>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </background>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <dd_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </dd_properties>
+        </text-style>
+      </LayoutItem>
+      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="15.6525,12.5708,mm" blendMode="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" fontColor="#000000" wrapChar="" frame="false" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="21.6797,33,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" zValue="8" rasterBorder="1" groupUuid="" position="15.6525,12.5708,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frameJoinStyle="miter" title="" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34028,37 +37622,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="title" indent="0">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="group" indent="0">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" name="subgroup" indent="0" marginTop="1">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          <style alignment="1" name="symbol" indent="0" marginTop="2">
+            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
           </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
+            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option type="int" name="showFeatureCount" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34066,47 +37660,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,399.106,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="MARSHAL POSITIONS" size="45.1194,7.36972,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,399.106,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.69321,398.344,mm" htmlState="0" size="45.1194,8.13137,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="5.69321,398.344,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34121,65 +37715,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,406.988,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="Page [% &quot;page&quot; %]" size="16.2476,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.69321,406.988,mm" htmlState="1" size="118.192,7.80192,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="5.69321,406.988,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" marginX="0" halign="1" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34194,65 +37788,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="214.292,406.988,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 2.0" size="27.7839,7.51682,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" groupUuid="" excludeFromExports="0" position="214.292,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="214.292,406.874,mm" htmlState="0" size="27.7839,7.51682,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 3.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="214.292,406.874,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginX="0" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34267,65 +37861,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="148.5,399.107,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="[%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;%]" size="93.5757,7.36902,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionLock="false" groupUuid="" excludeFromExports="0" position="148.5,399.107,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="148.501,398.344,mm" htmlState="1" size="93.5757,8.13167,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="&lt;strong>[%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;/strong>" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="148.501,398.344,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" marginX="0" halign="2" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
+        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
           <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
+            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34340,39 +37934,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
+          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="243.319,382.696,mm" zValue="3" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="49.3143" northMode="0" blendMode="0" pictureHeight="26.4325" pictureRotation="0" mapUuid="" northOffset="0" size="49.3143,31.2967,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../GunRun2022_250.png" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionLock="true" groupUuid="" excludeFromExports="0" position="243.319,382.696,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="243.319,382.696,mm" size="49.3143,31.2967,mm" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="26.4325" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="243.319,382.696,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../GunRun2022_250.png" pictureWidth="49.3143">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedSource">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="expression" value=""/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34380,42 +37974,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.84321,406.626,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="236.083,0.14328,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.84321,406.626,mm" size="236.083,0.14328,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="5.84321,406.626,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" frame="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
+        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
+          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
+              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="color" value="0,0,0,255"/>
+              <Option type="QString" name="joinstyle" value="miter"/>
+              <Option type="QString" name="offset" value="0,0"/>
+              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offset_unit" value="MM"/>
+              <Option type="QString" name="outline_color" value="0,0,0,255"/>
+              <Option type="QString" name="outline_style" value="solid"/>
+              <Option type="QString" name="outline_width" value="0.3"/>
+              <Option type="QString" name="outline_width_unit" value="MM"/>
+              <Option type="QString" name="style" value="solid"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34430,668 +38024,78 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.03,5.9483,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="286.94,392.396,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Marshal overview" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+      <LayoutItem positionOnPage="5.03,5.9483,mm" size="286.94,392.396,mm" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal overview" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.03,5.9483,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="dataDefinedMapScale">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option type="bool" name="active" value="false"/>
+                  <Option type="QString" name="field" value=""/>
+                  <Option type="int" name="type" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3928927268106257" xmax="18.40978433395395442" ymin="-33.93775368136344639" ymax="-33.91465407864861703"/>
+        <Extent xmin="18.36924763341120581" ymax="-33.9248732774534929" xmax="18.38613924055453452" ymin="-33.94797288016832226"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <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_cbaea960_3348_4aea_b155_46e5d310f792~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1~~~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" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
+          <Option type="QString" name="atlasRasterFormat" value="png"/>
+          <Option type="int" name="forceVector" value="0"/>
+          <Option type="int" name="pdfAppendGeoreference" value="1"/>
+          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
+          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
+          <Option type="QString" name="pdfExportThemes" value=""/>
+          <Option type="int" name="pdfIncludeMetadata" value="1"/>
+          <Option type="QString" name="pdfLayerOrder" 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_cbaea960_3348_4aea_b155_46e5d310f792~~~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_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
+          <Option type="int" name="pdfLosslessImages" value="0"/>
+          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
+          <Option type="int" name="pdfSimplify" value="1"/>
+          <Option type="int" name="pdfTextFormat" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" featureFilter="regexp_match( &quot;day&quot;, '1' )" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" filterFeatures="1"/>
-    </Layout>
-    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan Day 2">
-      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
-      <Grid resolution="10" offsetUnits="mm" offsetX="0" resUnits="mm" offsetY="0"/>
-      <PageCollection>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-            <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="255,255,255,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="no" name="outline_style" type="QString"/>
-              <Option value="0.26" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <prop k="offset" v="0,0"/>
-            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="offset_unit" v="MM"/>
-            <prop k="outline_color" v="0,0,0,255"/>
-            <prop k="outline_style" v="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-        <LayoutItem positionOnPage="0,0,mm" zValue="0" visibility="1" blendMode="0" size="297,420,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65638" frame="false" opacity="1" uuid="{1d6ee08b-2bae-454e-9747-92fe53ff794e}" positionLock="false" groupUuid="" excludeFromExports="0" position="0,0,mm" outlineWidthM="0.3,mm" background="true" templateUuid="{1d6ee08b-2bae-454e-9747-92fe53ff794e}" itemRotation="0">
-          <FrameColor alpha="255" red="0" green="0" blue="0"/>
-          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-          <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-              <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="miter" 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="35,35,35,255" name="outline_color" type="QString"/>
-                <Option value="no" name="outline_style" type="QString"/>
-                <Option value="0.26" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <prop k="offset" v="0,0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="outline_color" v="35,35,35,255"/>
-              <prop k="outline_style" v="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </LayoutItem>
-        <GuideCollection visible="1"/>
-      </PageCollection>
-      <LayoutItem columnSpace="2" type="65642" wmsLegendHeight="25" id="" background="true" positionOnPage="15.6525,12.5708,mm" size="21.6797,33,mm" title="" rasterBorder="1" symbolWidth="7" outlineWidthM="0.3,mm" equalColumnWidth="1" titleAlignment="1" symbolHeight="4" fontColor="#000000" groupUuid="" frame="false" splitLayer="0" uuid="{80d2d637-cb6b-4919-8d13-8e8608fc27b9}" map_uuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" visibility="1" frameJoinStyle="miter" wmsLegendWidth="50" templateUuid="{80d2d637-cb6b-4919-8d13-8e8608fc27b9}" resizeToContents="1" symbolAlignment="1" positionLock="true" rasterBorderColor="0,0,0,255" wrapChar="" zValue="8" rasterBorderWidth="0" minSymbolSize="0" maxSymbolSize="0" boxSpace="2" position="15.6525,12.5708,mm" columnCount="1" referencePoint="0" itemRotation="0" opacity="1" blendMode="0" legendFilterByAtlas="0" lineSpacing="1" excludeFromExports="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <styles>
-          <style alignment="1" indent="0" name="title">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
-          </style>
-          <style alignment="1" indent="0" name="group">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-          <style alignment="1" indent="0" name="subgroup" marginTop="1">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-          <style alignment="1" indent="0" name="symbol" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
-          </style>
-          <style alignment="1" marginLeft="2" indent="0" name="symbolLabel" marginTop="2">
-            <styleFont underline="0" italic="0" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
-          </style>
-        </styles>
-        <layer-tree-group>
-          <customproperties>
-            <Option/>
-          </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
-            <customproperties>
-              <Option/>
-            </customproperties>
-            <layer-tree-layer patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" name="all_routes">
-              <customproperties>
-                <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
-                </Option>
-              </customproperties>
-            </layer-tree-layer>
-          </layer-tree-group>
-          <custom-order enabled="0"/>
-        </layer-tree-group>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,399.106,mm" zValue="7" visibility="1" blendMode="0" marginY="1" labelText="MARSHAL POSITIONS" size="45.1194,7.36972,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{21317d02-e72f-414d-80e6-3dc4704f496e}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,399.106,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{21317d02-e72f-414d-80e6-3dc4704f496e}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="63" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,406.988,mm" zValue="6" visibility="1" blendMode="0" marginY="1" labelText="Page [% &quot;page&quot; %]" size="16.2476,7.80192,mm" referencePoint="0" halign="1" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{043d6b93-d56f-4b5b-943a-bae20902ecc2}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{043d6b93-d56f-4b5b-943a-bae20902ecc2}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="214.292,406.988,mm" zValue="5" visibility="1" blendMode="0" marginY="1" labelText="REVISION 2.0" size="27.7839,7.51682,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="32" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{767bf4e2-dd2d-40bf-a1a1-2a0799413ce0}" positionLock="true" groupUuid="" excludeFromExports="0" position="214.292,406.988,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{767bf4e2-dd2d-40bf-a1a1-2a0799413ce0}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="148.5,399.107,mm" zValue="4" visibility="1" blendMode="0" marginY="1" labelText="[%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;%]" size="93.5757,7.36902,mm" referencePoint="0" halign="2" frameJoinStyle="miter" valign="64" id="" type="65641" frame="false" opacity="1" htmlState="0" uuid="{d293ba25-5164-4566-9ce7-61cb613b0bc1}" positionLock="true" groupUuid="" excludeFromExports="0" position="148.5,399.107,mm" outlineWidthM="0.3,mm" background="false" marginX="1" templateUuid="{d293ba25-5164-4566-9ce7-61cb613b0bc1}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style forcedItalic="0" fontKerning="1" fontWeight="50" fontLetterSpacing="0" namedStyle="" capitalization="0" fontWordSpacing="0" blendMode="0" textColor="0,0,0,255" allowHtml="0" forcedBold="0" fontStrikeout="0" fontSize="12" multilineHeight="1" fontFamily="Myriad Pro" textOrientation="horizontal" textOpacity="1" fontSizeUnit="Point" fontItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontUnderline="0">
-          <families/>
-          <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskOpacity="1" maskSize="1.5" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""/>
-          <background shapeRotation="0" shapeRotationType="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeOffsetY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeX="0" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetUnit="MM" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeSizeType="0" shapeBlendMode="0" shapeBorderWidthUnit="MM">
-            <symbol alpha="1" frame_rate="10" name="fillSymbol" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                  <Option value="255,255,255,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="128,128,128,255" name="outline_color" type="QString"/>
-                  <Option value="no" name="outline_style" type="QString"/>
-                  <Option value="0" name="outline_width" type="QString"/>
-                  <Option value="MM" name="outline_width_unit" type="QString"/>
-                  <Option value="solid" name="style" type="QString"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadius="1.5" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowRadiusUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="243.319,382.696,mm" zValue="3" resizeMode="0" anchorPoint="8" visibility="1" svgFillColor="255,255,255,255" svgBorderWidth="0.2" pictureWidth="49.3143" northMode="0" blendMode="0" pictureHeight="26.4325" pictureRotation="0" mapUuid="" northOffset="0" size="49.3143,31.2967,mm" referencePoint="0" frameJoinStyle="miter" mode="1" id="" type="65640" frame="false" opacity="1" svgBorderColor="0,0,0,255" file="../GunRun2022_250.png" uuid="{b3ed3305-8f0b-47bc-81b5-23c34cc7f4e9}" positionLock="true" groupUuid="" excludeFromExports="0" position="243.319,382.696,mm" outlineWidthM="0.3,mm" background="false" templateUuid="{b3ed3305-8f0b-47bc-81b5-23c34cc7f4e9}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.84321,406.626,mm" zValue="2" visibility="1" shapeType="1" blendMode="0" size="236.083,0.14328,mm" referencePoint="0" frameJoinStyle="miter" id="" type="65643" frame="false" opacity="1" uuid="{a24294c4-895b-4801-b08b-9e3763b298cf}" positionLock="true" groupUuid="" excludeFromExports="0" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" background="false" cornerRadiusMeasure="0,mm" templateUuid="{a24294c4-895b-4801-b08b-9e3763b298cf}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <symbol alpha="1" frame_rate="10" name="" clip_to_extent="1" force_rhr="0" type="fill" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
-            <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-              <Option value="0,0,0,255" name="color" type="QString"/>
-              <Option value="miter" 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="0,0,0,255" name="outline_color" type="QString"/>
-              <Option value="solid" name="outline_style" type="QString"/>
-              <Option value="0.3" name="outline_width" type="QString"/>
-              <Option value="MM" name="outline_width_unit" type="QString"/>
-              <Option value="solid" name="style" type="QString"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <prop k="offset" v="0,0"/>
-            <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="offset_unit" v="MM"/>
-            <prop k="outline_color" v="0,0,0,255"/>
-            <prop k="outline_style" v="solid"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.03,5.9483,mm" zValue="1" visibility="1" labelMargin="0,mm" blendMode="0" followPreset="true" mapFlags="0" size="286.94,392.396,mm" keepLayerSet="false" referencePoint="0" isTemporal="0" frameJoinStyle="miter" id="" type="65639" frame="false" opacity="1" uuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" positionLock="true" groupUuid="" excludeFromExports="0" mapRotation="0" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" drawCanvasItems="false" background="true" followPresetName="Marshal overview" templateUuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" itemRotation="0">
-        <FrameColor alpha="255" red="0" green="0" blue="0"/>
-        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="" name="field" type="QString"/>
-                  <Option value="2" name="type" type="int"/>
-                </Option>
-              </Option>
-              <Option value="collection" name="type" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.36924763341120581" xmax="18.38613924055453452" ymin="-33.94797288016832226" ymax="-33.9248732774534929"/>
-        <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clipSource="" forceLabelsInside="0" enabled="0" clippingType="0"/>
-      </LayoutItem>
-      <customproperties>
-        <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <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_cbaea960_3348_4aea_b155_46e5d310f792~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1~~~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" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-        </Option>
-      </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" featureFilter="regexp_match( &quot;day&quot;, '2' )" hideCoverage="1" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" filterFeatures="1"/>
+      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortAscending="1" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="page" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.39752218252544935" xmax="18.40000421553460797" ymin="-33.90642284955147545" ymax="-33.90508771997006932">
+    <DefaultViewExtent xmin="18.31333691080681803" ymax="-33.87127486098422935" xmax="18.47461092490271284" ymin="-33.95802701381087729">
       <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>
@@ -35105,41 +38109,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 timeStepUnit="h" timeStep="1" cumulativeTemporalRange="0" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider offset="0" scale="1"/>
+      <TerrainProvider scale="1" offset="0"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option value="" name="decimal_separator" type="QChar"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="direction_format" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
-        <Option value="" name="thousand_separator" type="QChar"/>
+        <Option type="QChar" name="decimal_separator" value=""/>
+        <Option type="int" name="decimals" value="6"/>
+        <Option type="int" name="direction_format" value="0"/>
+        <Option type="int" name="rounding_type" value="0"/>
+        <Option type="bool" name="show_plus" value="false"/>
+        <Option type="bool" name="show_thousand_separator" value="true"/>
+        <Option type="bool" name="show_trailing_zeros" value="false"/>
+        <Option type="QChar" name="thousand_separator" value=""/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" name="angle_format" type="QString"/>
-        <Option value="" name="decimal_separator" type="QChar"/>
-        <Option value="6" name="decimals" type="int"/>
-        <Option value="0" name="rounding_type" type="int"/>
-        <Option value="false" name="show_leading_degree_zeros" type="bool"/>
-        <Option value="false" name="show_leading_zeros" type="bool"/>
-        <Option value="false" name="show_plus" type="bool"/>
-        <Option value="false" name="show_suffix" type="bool"/>
-        <Option value="true" name="show_thousand_separator" type="bool"/>
-        <Option value="false" name="show_trailing_zeros" type="bool"/>
-        <Option value="" name="thousand_separator" type="QChar"/>
+        <Option type="QString" name="angle_format" value="DecimalDegrees"/>
+        <Option type="QChar" name="decimal_separator" value=""/>
+        <Option type="int" name="decimals" value="6"/>
+        <Option type="int" name="rounding_type" value="0"/>
+        <Option type="bool" name="show_leading_degree_zeros" value="false"/>
+        <Option type="bool" name="show_leading_zeros" value="false"/>
+        <Option type="bool" name="show_plus" value="false"/>
+        <Option type="bool" name="show_suffix" value="false"/>
+        <Option type="bool" name="show_thousand_separator" value="true"/>
+        <Option type="bool" name="show_trailing_zeros" value="false"/>
+        <Option type="QChar" name="thousand_separator" value=""/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/all_routes.dbf b/GIS Base Map/all_routes.dbf
index 67c8776..5247542 100644
Binary files a/GIS Base Map/all_routes.dbf and b/GIS Base Map/all_routes.dbf differ
diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index 560a345..b2bd310 100644
Binary files a/GIS Base Map/all_routes.shp and b/GIS Base Map/all_routes.shp differ
diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index 33a12f5..0947c2f 100644
Binary files a/GIS Base Map/all_routes.shx and b/GIS Base Map/all_routes.shx differ
diff --git a/GIS Base Map/marshal overviews.dbf b/GIS Base Map/marshal overviews.dbf
index 3d34ef8..1eb3622 100644
Binary files a/GIS Base Map/marshal overviews.dbf and b/GIS Base Map/marshal overviews.dbf differ
diff --git a/GIS Base Map/marshal overviews.shp b/GIS Base Map/marshal overviews.shp
index ba2bac7..1d09a49 100644
Binary files a/GIS Base Map/marshal overviews.shp and b/GIS Base Map/marshal overviews.shp differ
diff --git a/GIS Base Map/marshal overviews.shx b/GIS Base Map/marshal overviews.shx
index 5da04c1..69e7b04 100644
Binary files a/GIS Base Map/marshal overviews.shx and b/GIS Base Map/marshal overviews.shx differ
diff --git a/GIS Base Map/marshal_positions.dbf b/GIS Base Map/marshal_positions.dbf
index b9a41c4..7be13f4 100644
Binary files a/GIS Base Map/marshal_positions.dbf and b/GIS Base Map/marshal_positions.dbf differ
diff --git a/GIS Base Map/marshal_positions.shp b/GIS Base Map/marshal_positions.shp
index f9fc401..7426a26 100644
Binary files a/GIS Base Map/marshal_positions.shp and b/GIS Base Map/marshal_positions.shp differ
diff --git a/GIS Base Map/marshal_positions.shx b/GIS Base Map/marshal_positions.shx
index 28ecb5c..e5c6d82 100644
Binary files a/GIS Base Map/marshal_positions.shx and b/GIS Base Map/marshal_positions.shx differ
diff --git a/README.md b/README.md
index cec734e..d65883e 100644
--- a/README.md
+++ b/README.md
@@ -60,13 +60,7 @@ Now you'll be able to use labels such as `[% csv_club %]` (to print the name of
 
 In order to generate the route markers at the correct locations:
 
-In `all_routes.shp`:
-
-Set a new field, `length_m`, equal to `$length * 100 * 1000`
-
-Set a new field, `length_km`, equal to `$length * 100`
-
-Then generate distances, using the QGIS plugin `Locate points along lines`. The polyline layer should `all_routes.shp`, and the output layer name should be `route_markers`. Leave the offset at 0 (unless you want to start counting some distance after the start!), and set the Interval to `0,01` (this may change depending on your configured units, but it should be one point per kilometre; you may need to play around with the settings). Lastly, check `Keep Attributes` (this allows us to keep the `Source` field for each line, which will connect the point to the route for which it is a marker), and check `Add endpoints`.
+Generate distances, using the QGIS plugin `Locate points along lines`. The polyline layer should `all_routes.shp`, and the output layer name should be `route_markers`. Leave the offset at 0 (unless you want to start counting some distance after the start!), and set the Interval to `0,01` (this may change depending on your configured units, but it should be one point per kilometre; you may need to play around with the settings). Lastly, check `Keep Attributes` (this allows us to keep the `Source` field for each line, which will connect the point to the route for which it is a marker), and check `Add endpoints`.
 
 Then, in the field calculator for the new `route_markers` row, set the field `Name` to the calculation:
 ```